Backport latest improvements from androwish

merge 8.6
2018-09-03 09:47:40 +00:00 · 2018-09-03 07:51:24 +00:00 · 2018-05-31 20:31:42 +00:00 · 2018-01-20 16:34:17 +00:00 · 2017-12-28 16:54:46 +00:00 · 2017-11-17 12:40:34 +00:00
790 changed files with 61537 additions and 92801 deletions
@@ -0,0 +1,19 @@
+compat/zlib/contrib/dotzlib/DotZLib/UnitTests.cs
+compat/zlib/contrib/vstudio/readme.txt
+compat/zlib/contrib/vstudio/*/zlib.rc
+compat/zlib/win32/*.txt
+compat/zlib/win64/*.txt
+libtommath/*.dsp
+libtommath/*.sln
+libtommath/*.vcproj
+tools/tcl.hpj.in
+tools/tcl.wse.in
+win/buildall.vc.bat
+win/coffbase.txt
+win/makefile.vc
+win/rules.vc
+win/rules-ext.vc
+win/targets.vc
+win/tcl.dsp
+win/tcl.dsw
+win/tcl.hpj.in
@@ -19,18 +19,14 @@
 */tcltest*
 */versions.vc
 */version.vc
-*/libtcl.vfs
-*/libtcl_*.zip
 html
 libtommath/bn.ilg
 libtommath/bn.ind
 libtommath/pretty.build
 libtommath/tommath.src
-libtommath/*.log
 libtommath/*.pdf
 libtommath/*.pl
 libtommath/*.sh
-libtommath/doc/*
 libtommath/tombc/*
 libtommath/pre_gen/*
 libtommath/pics/*
@@ -48,6 +44,5 @@ unix/pkgs/*
 win/Debug*
 win/Release*
 win/pkgs/*
-win/coffbase.txt
 win/tcl.hpj
 win/nmhlp-out.txt
@@ -1,3 +0,0 @@
-Important Note
-==========
-Please do not file issues with Tcl on Github. They are unlikely to be noticed in a timely fashion. Tcl issues are hosted in the [tcl fossil repository on core.tcl.tk](https://core.tcl.tk/tcl/tktnew); please post them there.
@@ -1,3 +0,0 @@
-Important Note
-==========
-Please do not file pull requests with Tcl on Github. They are unlikely to be noticed in a timely fashion. Tcl issues (including patches) are hosted in the [tcl fossil repository on core.tcl.tk](https://core.tcl.tk/tcl/tktnew); please post them there.
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>tcl8</name>
+	<name>tcl8.6</name>
 	<comment></comment>
 	<projects>
 	</projects>
@@ -1,297 +0,0 @@
-sudo: false
-language: c
-
-matrix:
-  include:
-    - os: linux
-      dist: xenial
-      compiler: clang
-      env:
-        - BUILD_DIR=unix
-    - os: linux
-      dist: xenial
-      compiler: clang
-      env:
-        - CFGOPT=--disable-shared
-        - BUILD_DIR=unix
-    - os: linux
-      dist: xenial
-      compiler: gcc
-      env:
-        - BUILD_DIR=unix
-    - os: linux
-      dist: xenial
-      compiler: gcc
-      env:
-        - CFGOPT=--disable-shared
-        - BUILD_DIR=unix
-    - os: linux
-      dist: xenial
-      compiler: gcc-4.9
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-4.9
-      env:
-        - BUILD_DIR=unix
-    - os: linux
-      dist: xenial
-      compiler: gcc-5
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-5
-      env:
-        - BUILD_DIR=unix
-    - os: linux
-      dist: xenial
-      compiler: gcc-6
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-6
-      env:
-        - BUILD_DIR=unix
-    - os: linux
-      dist: xenial
-      compiler: gcc-7
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-7
-      env:
-        - BUILD_DIR=unix
-    - os: linux
-      dist: xenial
-      compiler: gcc-7
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-7
-      env:
-        - BUILD_DIR=unix
-        - CFGOPT=CFLAGS=-DTCL_UTF_MAX=6
-    - os: linux
-      dist: xenial
-      compiler: gcc-7
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-7
-      env:
-        - BUILD_DIR=unix
-        - CFGOPT=CFLAGS=-DTCL_UTF_MAX=3
-    - os: linux
-      dist: xenial
-      compiler: gcc-7
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-7
-      env:
-        - BUILD_DIR=unix
-        - CFGOPT=CFLAGS=-DTCL_NO_DEPRECATED=1
-    - os: osx
-      osx_image: xcode8
-      env:
-        - BUILD_DIR=unix
-    - os: osx
-      osx_image: xcode8
-      env:
-        - BUILD_DIR=macosx
-        - NO_DIRECT_CONFIGURE=1
-    - os: osx
-      osx_image: xcode9
-      env:
-        - BUILD_DIR=macosx
-        - NO_DIRECT_CONFIGURE=1
-    - os: osx
-      osx_image: xcode10.2
-      env:
-        - BUILD_DIR=macosx
-        - NO_DIRECT_CONFIGURE=1
-### C builds not currently supported on Windows instances
-#    - os: windows
-#      env:
-#        - BUILD_DIR=win
-### ... so proxy with a Mingw cross-compile
-# Test with mingw-w64 (32 bit)
-    - os: linux
-      dist: xenial
-      compiler: i686-w64-mingw32-gcc
-      addons:
-        apt:
-          packages:
-            - gcc-mingw-w64-base
-            - binutils-mingw-w64-i686
-            - gcc-mingw-w64-i686
-            - gcc-mingw-w64
-            - gcc-multilib
-            - wine
-      env:
-        - BUILD_DIR=win
-        - CFGOPT=--host=i686-w64-mingw32
-        - NO_DIRECT_TEST=1
-    - os: linux
-      dist: xenial
-      compiler: i686-w64-mingw32-gcc
-      addons:
-        apt:
-          packages:
-            - gcc-mingw-w64-base
-            - binutils-mingw-w64-i686
-            - gcc-mingw-w64-i686
-            - gcc-mingw-w64
-            - gcc-multilib
-            - wine
-      env:
-        - BUILD_DIR=win
-        - CFGOPT="--host=i686-w64-mingw32 --disable-shared"
-        - NO_DIRECT_TEST=1
-    - os: linux
-      dist: xenial
-      compiler: i686-w64-mingw32-gcc
-      addons:
-        apt:
-          packages:
-            - gcc-mingw-w64-base
-            - binutils-mingw-w64-i686
-            - gcc-mingw-w64-i686
-            - gcc-mingw-w64
-            - gcc-multilib
-            - wine
-      env:
-        - BUILD_DIR=win
-        - CFGOPT="--host=i686-w64-mingw32 CFLAGS=-DTCL_UTF_MAX=6"
-        - NO_DIRECT_TEST=1
-    - os: linux
-      dist: xenial
-      compiler: i686-w64-mingw32-gcc
-      addons:
-        apt:
-          packages:
-            - gcc-mingw-w64-base
-            - binutils-mingw-w64-i686
-            - gcc-mingw-w64-i686
-            - gcc-mingw-w64
-            - gcc-multilib
-            - wine
-      env:
-        - BUILD_DIR=win
-        - CFGOPT="--host=i686-w64-mingw32 CFLAGS=-DTCL_UTF_MAX=3"
-        - NO_DIRECT_TEST=1
-    - os: linux
-      dist: xenial
-      compiler: i686-w64-mingw32-gcc
-      addons:
-        apt:
-          packages:
-            - gcc-mingw-w64-base
-            - binutils-mingw-w64-i686
-            - gcc-mingw-w64-i686
-            - gcc-mingw-w64
-            - gcc-multilib
-            - wine
-      env:
-        - BUILD_DIR=win
-        - CFGOPT="--host=i686-w64-mingw32 CFLAGS=-DTCL_NO_DEPRECATED=1"
-        - NO_DIRECT_TEST=1
-# Test with mingw-w64 (64 bit)
-    - os: linux
-      dist: xenial
-      compiler: x86_64-w64-mingw32-gcc
-      addons:
-        apt:
-          packages:
-            - gcc-mingw-w64-base
-            - binutils-mingw-w64-x86-64
-            - gcc-mingw-w64-x86-64
-            - gcc-mingw-w64
-            - wine
-      env:
-        - BUILD_DIR=win
-        - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit"
-        - NO_DIRECT_TEST=1
-    - os: linux
-      dist: xenial
-      compiler: x86_64-w64-mingw32-gcc
-      addons:
-        apt:
-          packages:
-            - gcc-mingw-w64-base
-            - binutils-mingw-w64-x86-64
-            - gcc-mingw-w64-x86-64
-            - gcc-mingw-w64
-            - wine
-      env:
-        - BUILD_DIR=win
-        - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit --disable-shared"
-        - NO_DIRECT_TEST=1
-    - os: linux
-      dist: xenial
-      compiler: x86_64-w64-mingw32-gcc
-      addons:
-        apt:
-          packages:
-            - gcc-mingw-w64-base
-            - binutils-mingw-w64-x86-64
-            - gcc-mingw-w64-x86-64
-            - gcc-mingw-w64
-            - wine
-      env:
-        - BUILD_DIR=win
-        - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit CFLAGS=-DTCL_UTF_MAX=6"
-        - NO_DIRECT_TEST=1
-    - os: linux
-      dist: xenial
-      compiler: x86_64-w64-mingw32-gcc
-      addons:
-        apt:
-          packages:
-            - gcc-mingw-w64-base
-            - binutils-mingw-w64-x86-64
-            - gcc-mingw-w64-x86-64
-            - gcc-mingw-w64
-            - wine
-      env:
-        - BUILD_DIR=win
-        - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit CFLAGS=-DTCL_UTF_MAX=3"
-        - NO_DIRECT_TEST=1
-    - os: linux
-      dist: xenial
-      compiler: x86_64-w64-mingw32-gcc
-      addons:
-        apt:
-          packages:
-            - gcc-mingw-w64-base
-            - binutils-mingw-w64-x86-64
-            - gcc-mingw-w64-x86-64
-            - gcc-mingw-w64
-            - wine
-      env:
-        - BUILD_DIR=win
-        - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit CFLAGS=-DTCL_NO_DEPRECATED=1"
-        - NO_DIRECT_TEST=1
-before_install:
-  - export ERROR_ON_FAILURES=1
-  - cd ${BUILD_DIR}
-install:
-  - test -n "$NO_DIRECT_CONFIGURE" || ./configure ${CFGOPT}
-script:
-  - make
-  # The styles=develop avoids some weird problems on OSX
-  - test -n "$NO_DIRECT_TEST" || make test styles=develop
@@ -1,6 +1,6 @@
 A NOTE ON THE CHANGELOG:
 Starting in early 2011, Tcl source code has been under the management of
-fossil, hosted at https://core.tcl-lang.org/tcl/ .  Fossil presents a "Timeline"
+fossil, hosted at http://core.tcl.tk/tcl/ .  Fossil presents a "Timeline"
 view of changes made that is superior in every way to a hand edited log file.
 Because of this, many Tcl developers are now out of the habit of maintaining
 this log file.  You may still find useful things in it, but the Timeline is
@@ -1426,7 +1426,7 @@
 	initialization assumptions of the TIP 280 code in CompileWord().

 	* generic/tclCompExpr.c:	Suppress the attempt to convert to
-	numeric when pre-compiling a constant expression indicates an error.
+	numeric when pre-compiling a constant expresion indicates an error.

 2007-08-22  Miguel Sofer  <msofer@users.sf.net>

@@ -1,5 +1,5 @@
 README:  Tcl
-    This is the Tcl 8.7a2 source distribution.
+    This is the Tcl 8.6.8 source distribution.
 	http://sourceforge.net/projects/tcl/files/Tcl/
    You can get any source release of Tcl from the URL above.

@@ -29,7 +29,7 @@ Tcl is maintained, enhanced, and distributed freely by the Tcl community.
 Source code development and tracking of bug reports and feature requests
 takes place at:

-	http://core.tcl-lang.org/
+	http://core.tcl.tk/

 Tcl/Tk release and mailing list services are hosted by SourceForge:

@@ -37,7 +37,7 @@ Tcl/Tk release and mailing list services are hosted by SourceForge:

 with the Tcl Developer Xchange hosted at:

-	http://www.tcl-lang.org/
+	http://www.tcl.tk/

 Tcl is a freely available open source package.  You can do virtually
 anything you like with it, such as modifying it, redistributing it,
@@ -49,21 +49,21 @@ and selling it either in whole or in part.  See the file

 Extensive documentation is available at our website.
 The home page for this release, including new features, is
-	http://www.tcl-lang.org/software/tcltk/8.7.html
+	http://www.tcl.tk/software/tcltk/8.6.html

 Detailed release notes can be found at the file distributions page
 by clicking on the relevant version.
 	http://sourceforge.net/projects/tcl/files/Tcl/

 Information about Tcl itself can be found at
-	http://www.tcl-lang.org/about/
+	http://www.tcl.tk/about/

 There have been many Tcl books on the market.  Many are mentioned in the Wiki:
-	http://wiki.tcl-lang.org/_/ref?N=25206
+	http://wiki.tcl.tk/_/ref?N=25206

-To view the complete set of reference manual entries for Tcl 8.7 online,
+To view the complete set of reference manual entries for Tcl 8.6 online,
 visit the URL:
-	http://www.tcl-lang.org/man/tcl8.7/
+	http://www.tcl.tk/man/tcl8.6/

 2a. Unix Documentation
 ----------------------
@@ -101,7 +101,7 @@ There are brief notes in the unix/README, win/README, and macosx/README about
 compiling on these different platforms.  There is additional information
 about building Tcl from sources at

-	http://www.tcl-lang.org/doc/howto/compile.html
+	http://www.tcl.tk/doc/howto/compile.html

 4. Development tools
 ---------------------------
@@ -127,7 +127,7 @@ see the "Support and bug fixes" section below.

 A Wiki-based open community site covering all aspects of Tcl/Tk is at:

-	http://wiki.tcl-lang.org/
+	http://wiki.tcl.tk/

 It is dedicated to the Tcl programming language and its extensions.  A
 wealth of useful information can be found there.  It contains code
@@ -153,7 +153,7 @@ We are very interested in receiving bug reports, patches, and suggestions
 for improvements.  We prefer that you send this information to us as
 tickets entered into our tracker at:

-	http://core.tcl-lang.org/tcl/reportlist
+	http://core.tcl.tk/tcl/reportlist

 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
@@ -169,13 +169,13 @@ questions for which no one else is likely to know the answer.  In addition,
 see the following Web site for links to other organizations that offer
 Tcl/Tk training:

-	http://wiki.tcl-lang.org/training
+	http://wiki.tcl.tk/training

 9. Tracking Development
 -----------------------

 Tcl is developed in public.  To keep an eye on how Tcl is changing, see
-	http://core.tcl-lang.org/
+	http://core.tcl.tk/

 10. Thank You
 -------------
@@ -8830,123 +8830,3 @@ improvements to regexp engine from Postgres (lane,porter,fellows,seltenreich)
 2017-12-19 (bug)[586e71] EvalObjv exception handling at level #0 (sebres,porter)

 --- Released 8.6.8, December 22, 2017 --- http://core.tcl.tk/tcl/ for details
-
-2018-02-11 (enhance) stop blocking conversion of object to/from class (coulter)
-
-2018-02-12 (enhance) NR-enable [package require] (coulter)
-
-2018-02-14 (bug)[9fd5c6] crash in object deletion, test oo-11.5 (coulter)
-
-2018-02-14 (bug)[3c32a3] crash deleting object with class mixed in (coulter)
-
-2018-02-15 (platform) stop using -lieee, removed from glibc-2.27 (porter)
-***POTENTIAL INCOMPATIBILITY for math programs that embed Tcl***
-
-2018-02-23 (bug)[8e6a9a] bad binary [string match], test string-11.55 (porter)
-
-2018-03-05 (bug)[1873ea] repair multi-thread std channel init (sebres)
-
-2018-03-09 (bug)[db36fa] broken bytecode for index values (porter)
-
-2018-03-13 (bug) broken compiled [string replace], test string-14.19 (porter)
-
-2018-03-14 (bug) [string trim*] engine crashed on invalid UTF (sebres)
-
-2018-04-17 (bug) missing trace in compiled [array set], test var-20.11 (porter)
-
-2018-04-22 (bug)[46a241] crash in unset array with search, var-13.[23] (goth)
-
-2018-04-30 (bug)[27b682] race made [file delete] raise "no such file" (sebres)
-
-2018-06-04 (bug)[925643] 32/64 cleanup of filesystem DIR operations (sebres)
-
-2018-06-18 (bug) leaks in TclSetEnv and env cache (coulter)
-
-2018-06-24 (bug)[3592747] [yieldto] dying namespace, tailcall-14.1 (coulter)
-
-2018-07-09 (bug)[270f78] race in [file mkdir] (sebres)
-
-2018-07-12 (bug)[3f7af0] [file delete] raised "permission denied" (sebres)
-
-2018-07-26 (bug)[d051b7] overflow crash in [format] (sebres)
-
-2018-08-29 revised quoting of [exec] args in generated command line (sebres)
-***POTENTIAL INCOMPATIBILITY***
-
-2018-09-20 HTTP Keep-Alive with pipelined requests (nash)
-=> http 2.9.0
-
-2018-09-27 (new)[TIP 505] [lreplace] accepts all out of range indices (porter)
-
-2018-10-04 (bug) Prevent crash from NULL keyName (nijtmans)
-=> registry 1.3.3
-
-2018-10-26 (enhance) advance dde version (nijtmans)
-=> dde 1.4.1
-
-2018-10-27 tzdata updated to Olson's tzdata2018g (jima)
-
-2018-10-29 Update tcltest package for Travis support (fellows)
-=> tcltest 2.5.0
-
-2018-11-09 (bug)[35a8f1] overlong string length of some lists (owens)
-
-2018-11-16 (bug)[00d04c] Repair [binary encode base64] (sebres)
-
- Released 8.6.9, November 16, 2018 - details at http://core.tcl-lang.org/tcl/ -
-
-Changes to 8.7a1 include all changes to the 8.6 line through 8.6.7,
-plus the following, which focuses on the high-level feature changes
-in this changeset (new minor version) rather than bug fixes:
-
-2016-03-17 (bug)[0b8c38] socket accept callbacks always in global ns (porter)
-        *** POTENTIAL INCOMPATIBILITY ***
-
-2016-07-01 Hack accommodations for legacy Itcl 3 disabled (porter)
-
-2016-07-12 Make TCL_HASH_TYPE build-time configurable (nijtmans)
-
-2016-07-19 (bug)[0363f0] Partial array search ID reform (porter)
-
-2016-07-19 (feature removed) Tcl_ObjType "array search" unregistered (porter)
-	*** POTENTIAL INCOMPATIBILITY for Tcl_GetObjType("array search") ***
-
-2016-10-04 Server socket on port 0 chooses port supporting IPv4 * IPv6 (max)
-
-2016-11-25 [array names -regexp] supports backrefs (goth)
-
-2017-01-04 (TIP 456) New routine Tcl_OpenTcpServerEx() (limeboy)
-
-2017-01-04 (TIP 459) New subcommand [package files] (nijtmans)
-
-2017-01-16 threaded allocator initialization repair (vasiljevic,nijtmans)
-
-2017-01-30 Add to Win shell builtins: assoc ftype move (ashok)
-
-2017-03-31 TCL_MEM_DEBUG facilities better support 64-bit memory (nijtmans)
-
-2017-04-13 \u escaped content in msg files converted to true utf-8 (nijtmans)
-
-2017-05-18 (TIP 458) New epoll or kqueue notifiers are default (alborboz)
-
-2017-05-31 Purge build support for SunOS-4.* (stu)
-
-2017-06-22 (TIP 463) New option [regsub ... -command ...] (fellows)
-
-2017-06-22 (TIP 470) Tcl_GetDefineContextObject();[oo::define [self]] (fellows)
-=> TclOO 1.2.0
-
-2017-06-23 (TIP 472) Support 0d as prefix of decimal numbers (iyer,griffin)
-
-2017-08-31 (bug)[2a9465] http state 100 continue handling broken (oehlmann)
-
-2017-09-02 (bug)[0e4d88] replace command, delete trace kills namespace (porter)
-
--- Released 8.7a1, September 8, 2017 --- http://core.tcl.tk/tcl/ for details
-
-2018-03-12 (TIP 490) add oo support for msgcat => msgcat 1.7.0 (oehlmann)
-
-2018-03-12 (TIP 499) custom locale preference list (oehlmann)
-=> msgcat 1.7.0
-
- Released 8.7a3, Nov 30, 2018 --- http://core.tcl-lang.org/tcl/ for details -
@@ -0,0 +1,36 @@
+/*
+ * 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.
+ */
+
+#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(char *, char **);
+
+double
+fixstrtod(
+    char *string,
+    char **endPtr)
+{
+    double d;
+    d = strtod(string, endPtr);
+    if ((endPtr != NULL) && (*endPtr != string) && ((*endPtr)[-1] == 0)) {
+	*endPtr -= 1;
+    }
+    return d;
+}
@@ -0,0 +1,14 @@
+/*
+ * 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.
+ */
@@ -106,5 +106,5 @@ closedir(
    close(dirp->dd_fd);
    dirp->dd_fd = -1;
    dirp->dd_loc = 0;
-    ckfree(dirp);
+    ckfree((char *) dirp);
 }
@@ -29,6 +29,7 @@ extern char *		malloc(unsigned int numBytes);
 extern void		qsort(void *base, int n, int size, int (*compar)(
 			    const void *element1, const void *element2));
 extern char *		realloc(char *ptr, unsigned int numBytes);
+extern double		strtod(const char *string, char **endPtr);
 extern long		strtol(const char *string, char **endPtr, int base);
 extern unsigned long	strtoul(const char *string, char **endPtr, int base);

@@ -0,0 +1,252 @@
+/*
+ * 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.
+ */
+
+#include "tclInt.h"
+
+#ifndef TRUE
+#define TRUE 1
+#define FALSE 0
+#endif
+#ifndef NULL
+#define NULL 0
+#endif
+
+static const 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 const 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(
+    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;
+    const double *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(UCHAR(*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;
+	}
+	if (!isdigit(UCHAR(*p))) {
+	    p = pExp;
+	    goto done;
+	}
+	while (isdigit(UCHAR(*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;
+	errno = ERANGE;
+    }
+    dblExp = 1.0;
+    for (d = powersOf10; exp != 0; exp >>= 1, ++d) {
+	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;
+}
@@ -53,7 +53,7 @@ strtol(
     */

    p = string;
-    while (TclIsSpaceProc(*p)) {
+    while (isspace(UCHAR(*p))) {
 	p += 1;
    }

@@ -74,7 +74,7 @@ strtoul(
     */

    p = string;
-    while (TclIsSpaceProc(*p)) {
+    while (isspace(UCHAR(*p))) {
 	p += 1;
    }
    if (*p == '-') {
@@ -0,0 +1,76 @@
+/*
+ * 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.
+ */
+
+#ifndef _UNISTD
+#define _UNISTD
+
+#include <sys/types.h>
+
+#ifndef NULL
+#define NULL    0
+#endif
+
+/*
+ * Strict POSIX stuff goes here. Extensions go down below, in the ifndef
+ * _POSIX_SOURCE section.
+ */
+
+extern void		_exit(int status);
+extern int		access(const char *path, int mode);
+extern int		chdir(const char *path);
+extern int		chown(const char *path, uid_t owner, gid_t group);
+extern int		close(int fd);
+extern int		dup(int oldfd);
+extern int		dup2(int oldfd, int newfd);
+extern int		execl(const char *path, ...);
+extern int		execle(const char *path, ...);
+extern int		execlp(const char *file, ...);
+extern int		execv(const char *path, char **argv);
+extern int		execve(const char *path, char **argv, char **envp);
+extern int		execvpw(const char *file, char **argv);
+extern pid_t		fork(void);
+extern char *		getcwd(char *buf, size_t size);
+extern gid_t		getegid(void);
+extern uid_t		geteuid(void);
+extern gid_t		getgid(void);
+extern int		getgroups(int bufSize, int *buffer);
+extern pid_t		getpid(void);
+extern uid_t		getuid(void);
+extern int		isatty(int fd);
+extern long		lseek(int fd, long offset, int whence);
+extern int		pipe(int *fildes);
+extern int		read(int fd, char *buf, size_t size);
+extern int		setgid(gid_t group);
+extern int		setuid(uid_t user);
+extern unsigned		sleep(unsigned seconds);
+extern char *		ttyname(int fd);
+extern int		unlink(const char *path);
+extern int		write(int fd, const char *buf, size_t size);
+
+#ifndef	_POSIX_SOURCE
+extern char *		crypt(const char *, const char *);
+extern int		fchown(int fd, uid_t owner, gid_t group);
+extern int		flock(int fd, int operation);
+extern int		ftruncate(int fd, unsigned long length);
+extern int		ioctl(int fd, int request, ...);
+extern int		readlink(const char *path, char *buf, int bufsize);
+extern int		setegid(gid_t group);
+extern int		seteuidw(uid_t user);
+extern int		setreuid(int ruid, int euid);
+extern int		symlink(const char *, const char *);
+extern int		ttyslot(void);
+extern int		truncate(const char *path, unsigned long length);
+extern int		vfork(void);
+#endif /* _POSIX_SOURCE */
+
+#endif /* _UNISTD */
@@ -100,7 +100,7 @@ waitpid(
 	} else {
 	    prevPtr->nextPtr = waitPtr->nextPtr;
 	}
-	ckfree(waitPtr);
+	ckfree((char *) waitPtr);
 	return result;
    }

@@ -29,12 +29,6 @@

 #define CRC32(c, b) ((*(pcrc_32_tab+(((int)(c) ^ (b)) & 0xff))) ^ ((c) >> 8))

-#ifdef Z_U4
-   typedef Z_U4 z_crc_t;
-#else
-   typedef unsigned long z_crc_t;
-#endif
-
 /***********************************************************************
 * Return the next byte in the pseudo-random sequence
 */
@@ -97,7 +97,7 @@ void change_file_date(filename,dosdate,tmu_date)
  SetFileTime(hFile,&ftm,&ftLastAcc,&ftm);
  CloseHandle(hFile);
 #else
-#if defined(unix) || defined(__APPLE__)
+#ifdef unix || __APPLE__
  struct utimbuf ut;
  struct tm newdate;
  newdate.tm_sec = tmu_date.tm_sec;
@@ -12,6 +12,7 @@
         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
 */

+
 #if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__))
        #ifndef __USE_FILE_OFFSET64
                #define __USE_FILE_OFFSET64
@@ -27,7 +28,7 @@
        #endif
 #endif

-#if defined(__APPLE__) || defined(IOAPI_NO_64)
+#ifdef __APPLE__
 // In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions
 #define FOPEN_FUNC(filename, mode) fopen(filename, mode)
 #define FTELLO_FUNC(stream) ftello(stream)
@@ -38,7 +39,8 @@
 #define FSEEKO_FUNC(stream, offset, origin) fseeko64(stream, offset, origin)
 #endif

-#include "tinydir.h"
+
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -92,7 +94,7 @@ uLong filetime(f, tmzip, dt)
  return ret;
 }
 #else
-#if defined(unix) || defined(__APPLE__)
+#ifdef unix || __APPLE__
 uLong filetime(f, tmzip, dt)
    char *f;               /* name of file to get info on */
    tm_zip *tmzip;         /* return value: access, modific. and creation times */
@@ -170,7 +172,6 @@ void do_banner()
 void do_help()
 {
    printf("Usage : minizip [-o] [-a] [-0 to -9] [-p password] [-j] file.zip [files_to_add]\n\n" \
-           "  -r  Scan directories recursively\n" \
           "  -o  Overwrite existing file.zip\n" \
           "  -a  Append to existing file.zip\n" \
           "  -0  Store only\n" \
@@ -242,153 +243,12 @@ int isLargeFile(const char* filename)
 return largeFile;
 }

-void addFileToZip(zipFile zf, const char *filenameinzip, const char *password, int opt_exclude_path,int opt_compress_level) {
-    FILE * fin;
-    int size_read;
-    const char *savefilenameinzip;
-    zip_fileinfo zi;
-    unsigned long crcFile=0;
-    int zip64 = 0;
-    int err=0;
-    int size_buf=WRITEBUFFERSIZE;
-    unsigned char buf[WRITEBUFFERSIZE];
-    zi.tmz_date.tm_sec = zi.tmz_date.tm_min = zi.tmz_date.tm_hour =
-    zi.tmz_date.tm_mday = zi.tmz_date.tm_mon = zi.tmz_date.tm_year = 0;
-    zi.dosDate = 0;
-    zi.internal_fa = 0;
-    zi.external_fa = 0;
-    filetime(filenameinzip,&zi.tmz_date,&zi.dosDate);
-
-/*
-    err = zipOpenNewFileInZip(zf,filenameinzip,&zi,
-                     NULL,0,NULL,0,NULL / * comment * /,
-                     (opt_compress_level != 0) ? Z_DEFLATED : 0,
-                     opt_compress_level);
-*/
-    if ((password != NULL) && (err==ZIP_OK))
-        err = getFileCrc(filenameinzip,buf,size_buf,&crcFile);
-
-    zip64 = isLargeFile(filenameinzip);
-
-   /* The path name saved, should not include a leading slash. */
-   /*if it did, windows/xp and dynazip couldn't read the zip file. */
-     savefilenameinzip = filenameinzip;
-     while( savefilenameinzip[0] == '\\' || savefilenameinzip[0] == '/' )
-     {
-         savefilenameinzip++;
-     }
-
-     /*should the zip file contain any path at all?*/
-     if( opt_exclude_path )
-     {
-         const char *tmpptr;
-         const char *lastslash = 0;
-         for( tmpptr = savefilenameinzip; *tmpptr; tmpptr++)
-         {
-             if( *tmpptr == '\\' || *tmpptr == '/')
-             {
-                 lastslash = tmpptr;
-             }
-         }
-         if( lastslash != NULL )
-         {
-             savefilenameinzip = lastslash+1; // base filename follows last slash.
-         }
-     }
-
-     /**/
-    err = zipOpenNewFileInZip3_64(zf,savefilenameinzip,&zi,
-                     NULL,0,NULL,0,NULL /* comment*/,
-                     (opt_compress_level != 0) ? Z_DEFLATED : 0,
-                     opt_compress_level,0,
-                     /* -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY, */
-                     -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
-                     password,crcFile, zip64);
-
-    if (err != ZIP_OK)
-        printf("error in opening %s in zipfile\n",filenameinzip);
-    else
-    {
-        fin = FOPEN_FUNC(filenameinzip,"rb");
-        if (fin==NULL)
-        {
-            err=ZIP_ERRNO;
-            printf("error in opening %s for reading\n",filenameinzip);
-        }
-    }
-
-    if (err == ZIP_OK)
-        do
-        {
-            err = ZIP_OK;
-            size_read = (int)fread(buf,1,size_buf,fin);
-            if (size_read < size_buf)
-                if (feof(fin)==0)
-            {
-                printf("error in reading %s\n",filenameinzip);
-                err = ZIP_ERRNO;
-            }
-
-            if (size_read>0)
-            {
-                err = zipWriteInFileInZip (zf,buf,size_read);
-                if (err<0)
-                {
-                    printf("error in writing %s in the zipfile\n",
-                                     filenameinzip);
-                }
-
-            }
-        } while ((err == ZIP_OK) && (size_read>0));
-
-    if (fin)
-        fclose(fin);
-
-    if (err<0)
-        err=ZIP_ERRNO;
-    else
-    {
-        err = zipCloseFileInZip(zf);
-        if (err!=ZIP_OK)
-            printf("error in closing %s in the zipfile\n",
-                        filenameinzip);
-    }
-}
-
-
-void addPathToZip(zipFile zf, const char *filenameinzip, const char *password, int opt_exclude_path,int opt_compress_level) {
-    tinydir_dir dir;
-    int i;
-    char newname[512];
-
-    tinydir_open_sorted(&dir, filenameinzip);
-
-    for (i = 0; i < dir.n_files; i++)
-    {
-        tinydir_file file;
-        tinydir_readfile_n(&dir, &file, i);
-        if(strcmp(file.name,".")==0) continue;
-        if(strcmp(file.name,"..")==0) continue;
-        sprintf(newname,"%s/%s",dir.path,file.name);
-        if (file.is_dir)
-        {
-            addPathToZip(zf,newname,password,opt_exclude_path,opt_compress_level);
-        } else {
-            addFileToZip(zf,newname,password,opt_exclude_path,opt_compress_level);
-        }
-    }
-
-    tinydir_close(&dir);
-}
-
-
 int main(argc,argv)
    int argc;
    char *argv[];
 {
    int i;
-    int opt_recursive=0;
-    int opt_overwrite=1;
+    int opt_overwrite=0;
    int opt_compress_level=Z_DEFAULT_COMPRESSION;
    int opt_exclude_path=0;
    int zipfilenamearg = 0;
@@ -425,8 +285,7 @@ int main(argc,argv)
                        opt_compress_level = c-'0';
                    if ((c=='j') || (c=='J'))
                        opt_exclude_path = 1;
-                    if ((c=='r') || (c=='R'))
-                        opt_recursive = 1;
+
                    if (((c=='p') || (c=='P')) && (i+1<argc))
                    {
                        password=argv[i+1];
@@ -533,14 +392,117 @@ int main(argc,argv)
                  ((argv[i][1]=='o') || (argv[i][1]=='O') ||
                   (argv[i][1]=='a') || (argv[i][1]=='A') ||
                   (argv[i][1]=='p') || (argv[i][1]=='P') ||
-                   (argv[i][1]=='r') || (argv[i][1]=='R') ||
                   ((argv[i][1]>='0') || (argv[i][1]<='9'))) &&
                  (strlen(argv[i]) == 2)))
            {
-                if(opt_recursive) {
-                    addPathToZip(zf,argv[i],password,opt_exclude_path,opt_compress_level);
-                } else {
-                    addFileToZip(zf,argv[i],password,opt_exclude_path,opt_compress_level);
+                FILE * fin;
+                int size_read;
+                const char* filenameinzip = argv[i];
+                const char *savefilenameinzip;
+                zip_fileinfo zi;
+                unsigned long crcFile=0;
+                int zip64 = 0;
+
+                zi.tmz_date.tm_sec = zi.tmz_date.tm_min = zi.tmz_date.tm_hour =
+                zi.tmz_date.tm_mday = zi.tmz_date.tm_mon = zi.tmz_date.tm_year = 0;
+                zi.dosDate = 0;
+                zi.internal_fa = 0;
+                zi.external_fa = 0;
+                filetime(filenameinzip,&zi.tmz_date,&zi.dosDate);
+
+/*
+                err = zipOpenNewFileInZip(zf,filenameinzip,&zi,
+                                 NULL,0,NULL,0,NULL / * comment * /,
+                                 (opt_compress_level != 0) ? Z_DEFLATED : 0,
+                                 opt_compress_level);
+*/
+                if ((password != NULL) && (err==ZIP_OK))
+                    err = getFileCrc(filenameinzip,buf,size_buf,&crcFile);
+
+                zip64 = isLargeFile(filenameinzip);
+
+                                                         /* The path name saved, should not include a leading slash. */
+               /*if it did, windows/xp and dynazip couldn't read the zip file. */
+                 savefilenameinzip = filenameinzip;
+                 while( savefilenameinzip[0] == '\\' || savefilenameinzip[0] == '/' )
+                 {
+                     savefilenameinzip++;
+                 }
+
+                 /*should the zip file contain any path at all?*/
+                 if( opt_exclude_path )
+                 {
+                     const char *tmpptr;
+                     const char *lastslash = 0;
+                     for( tmpptr = savefilenameinzip; *tmpptr; tmpptr++)
+                     {
+                         if( *tmpptr == '\\' || *tmpptr == '/')
+                         {
+                             lastslash = tmpptr;
+                         }
+                     }
+                     if( lastslash != NULL )
+                     {
+                         savefilenameinzip = lastslash+1; // base filename follows last slash.
+                     }
+                 }
+
+                 /**/
+                err = zipOpenNewFileInZip3_64(zf,savefilenameinzip,&zi,
+                                 NULL,0,NULL,0,NULL /* comment*/,
+                                 (opt_compress_level != 0) ? Z_DEFLATED : 0,
+                                 opt_compress_level,0,
+                                 /* -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY, */
+                                 -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
+                                 password,crcFile, zip64);
+
+                if (err != ZIP_OK)
+                    printf("error in opening %s in zipfile\n",filenameinzip);
+                else
+                {
+                    fin = FOPEN_FUNC(filenameinzip,"rb");
+                    if (fin==NULL)
+                    {
+                        err=ZIP_ERRNO;
+                        printf("error in opening %s for reading\n",filenameinzip);
+                    }
+                }
+
+                if (err == ZIP_OK)
+                    do
+                    {
+                        err = ZIP_OK;
+                        size_read = (int)fread(buf,1,size_buf,fin);
+                        if (size_read < size_buf)
+                            if (feof(fin)==0)
+                        {
+                            printf("error in reading %s\n",filenameinzip);
+                            err = ZIP_ERRNO;
+                        }
+
+                        if (size_read>0)
+                        {
+                            err = zipWriteInFileInZip (zf,buf,size_read);
+                            if (err<0)
+                            {
+                                printf("error in writing %s in the zipfile\n",
+                                                 filenameinzip);
+                            }
+
+                        }
+                    } while ((err == ZIP_OK) && (size_read>0));
+
+                if (fin)
+                    fclose(fin);
+
+                if (err<0)
+                    err=ZIP_ERRNO;
+                else
+                {
+                    err = zipCloseFileInZip(zf);
+                    if (err!=ZIP_OK)
+                        printf("error in closing %s in the zipfile\n",
+                                    filenameinzip);
                }
            }
        }
@@ -1,816 +0,0 @@
-/*
-Copyright (c) 2013-2017, tinydir authors:
- Cong Xu
- Lautis Sun
- Baudouin Feildel
- Andargor <andargor@yahoo.com>
-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.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-*/
-#ifndef TINYDIR_H
-#define TINYDIR_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if ((defined _UNICODE) && !(defined UNICODE))
-#define UNICODE
-#endif
-
-#if ((defined UNICODE) && !(defined _UNICODE))
-#define _UNICODE
-#endif
-
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#ifdef _MSC_VER
-# define WIN32_LEAN_AND_MEAN
-# include <windows.h>
-# include <tchar.h>
-# pragma warning(push)
-# pragma warning (disable : 4996)
-#else
-# include <dirent.h>
-# include <libgen.h>
-# include <sys/stat.h>
-# include <stddef.h>
-#endif
-#ifdef __MINGW32__
-# include <tchar.h>
-#endif
-
-
-/* types */
-
-/* Windows UNICODE wide character support */
-#if defined _MSC_VER || defined __MINGW32__
-# define _tinydir_char_t TCHAR
-# define TINYDIR_STRING(s) _TEXT(s)
-# define _tinydir_strlen _tcslen
-# define _tinydir_strcpy _tcscpy
-# define _tinydir_strcat _tcscat
-# define _tinydir_strcmp _tcscmp
-# define _tinydir_strrchr _tcsrchr
-# define _tinydir_strncmp _tcsncmp
-#else
-# define _tinydir_char_t char
-# define TINYDIR_STRING(s) s
-# define _tinydir_strlen strlen
-# define _tinydir_strcpy strcpy
-# define _tinydir_strcat strcat
-# define _tinydir_strcmp strcmp
-# define _tinydir_strrchr strrchr
-# define _tinydir_strncmp strncmp
-#endif
-
-#if (defined _MSC_VER || defined __MINGW32__)
-# include <windows.h>
-# define _TINYDIR_PATH_MAX MAX_PATH
-#elif defined  __linux__
-# include <limits.h>
-# define _TINYDIR_PATH_MAX PATH_MAX
-#elif defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
-# include <sys/param.h>
-# if defined(BSD)
-#  include <limits.h>
-#  define _TINYDIR_PATH_MAX PATH_MAX
-# endif
-#endif
-
-#ifndef _TINYDIR_PATH_MAX
-#define _TINYDIR_PATH_MAX 4096
-#endif
-
-#ifdef _MSC_VER
-/* extra chars for the "\\*" mask */
-# define _TINYDIR_PATH_EXTRA 2
-#else
-# define _TINYDIR_PATH_EXTRA 0
-#endif
-
-#define _TINYDIR_FILENAME_MAX 256
-
-#if (defined _MSC_VER || defined __MINGW32__)
-#define _TINYDIR_DRIVE_MAX 3
-#endif
-
-#ifdef _MSC_VER
-# define _TINYDIR_FUNC static __inline
-#elif !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L
-# define _TINYDIR_FUNC static __inline__
-#else
-# define _TINYDIR_FUNC static inline
-#endif
-
-/* readdir_r usage; define TINYDIR_USE_READDIR_R to use it (if supported) */
-#ifdef TINYDIR_USE_READDIR_R
-
-/* readdir_r is a POSIX-only function, and may not be available under various
- * environments/settings, e.g. MinGW. Use readdir fallback */
-#if _POSIX_C_SOURCE >= 1 || _XOPEN_SOURCE || _BSD_SOURCE || _SVID_SOURCE ||\
-	_POSIX_SOURCE
-# define _TINYDIR_HAS_READDIR_R
-#endif
-#if _POSIX_C_SOURCE >= 200112L
-# define _TINYDIR_HAS_FPATHCONF
-# include <unistd.h>
-#endif
-#if _BSD_SOURCE || _SVID_SOURCE || \
-	(_POSIX_C_SOURCE >= 200809L || _XOPEN_SOURCE >= 700)
-# define _TINYDIR_HAS_DIRFD
-# include <sys/types.h>
-#endif
-#if defined _TINYDIR_HAS_FPATHCONF && defined _TINYDIR_HAS_DIRFD &&\
-	defined _PC_NAME_MAX
-# define _TINYDIR_USE_FPATHCONF
-#endif
-#if defined __MINGW32__ || !defined _TINYDIR_HAS_READDIR_R ||\
-	!(defined _TINYDIR_USE_FPATHCONF || defined NAME_MAX)
-# define _TINYDIR_USE_READDIR
-#endif
-
-/* Use readdir by default */
-#else
-# define _TINYDIR_USE_READDIR
-#endif
-
-/* MINGW32 has two versions of dirent, ASCII and UNICODE*/
-#ifndef _MSC_VER
-#if (defined __MINGW32__) && (defined _UNICODE)
-#define _TINYDIR_DIR _WDIR
-#define _tinydir_dirent _wdirent
-#define _tinydir_opendir _wopendir
-#define _tinydir_readdir _wreaddir
-#define _tinydir_closedir _wclosedir
-#else
-#define _TINYDIR_DIR DIR
-#define _tinydir_dirent dirent
-#define _tinydir_opendir opendir
-#define _tinydir_readdir readdir
-#define _tinydir_closedir closedir
-#endif
-#endif
-
-/* Allow user to use a custom allocator by defining _TINYDIR_MALLOC and _TINYDIR_FREE. */
-#if    defined(_TINYDIR_MALLOC) &&  defined(_TINYDIR_FREE)
-#elif !defined(_TINYDIR_MALLOC) && !defined(_TINYDIR_FREE)
-#else
-#error "Either define both alloc and free or none of them!"
-#endif
-
-#if !defined(_TINYDIR_MALLOC)
-	#define _TINYDIR_MALLOC(_size) malloc(_size)
-	#define _TINYDIR_FREE(_ptr)    free(_ptr)
-#endif /* !defined(_TINYDIR_MALLOC) */
-
-typedef struct tinydir_file
-{
-	_tinydir_char_t path[_TINYDIR_PATH_MAX];
-	_tinydir_char_t name[_TINYDIR_FILENAME_MAX];
-	_tinydir_char_t *extension;
-	int is_dir;
-	int is_reg;
-
-#ifndef _MSC_VER
-#ifdef __MINGW32__
-	struct _stat _s;
-#else
-	struct stat _s;
-#endif
-#endif
-} tinydir_file;
-
-typedef struct tinydir_dir
-{
-	_tinydir_char_t path[_TINYDIR_PATH_MAX];
-	int has_next;
-	size_t n_files;
-
-	tinydir_file *_files;
-#ifdef _MSC_VER
-	HANDLE _h;
-	WIN32_FIND_DATA _f;
-#else
-	_TINYDIR_DIR *_d;
-	struct _tinydir_dirent *_e;
-#ifndef _TINYDIR_USE_READDIR
-	struct _tinydir_dirent *_ep;
-#endif
-#endif
-} tinydir_dir;
-
-
-/* declarations */
-
-_TINYDIR_FUNC
-int tinydir_open(tinydir_dir *dir, const _tinydir_char_t *path);
-_TINYDIR_FUNC
-int tinydir_open_sorted(tinydir_dir *dir, const _tinydir_char_t *path);
-_TINYDIR_FUNC
-void tinydir_close(tinydir_dir *dir);
-
-_TINYDIR_FUNC
-int tinydir_next(tinydir_dir *dir);
-_TINYDIR_FUNC
-int tinydir_readfile(const tinydir_dir *dir, tinydir_file *file);
-_TINYDIR_FUNC
-int tinydir_readfile_n(const tinydir_dir *dir, tinydir_file *file, size_t i);
-_TINYDIR_FUNC
-int tinydir_open_subdir_n(tinydir_dir *dir, size_t i);
-
-_TINYDIR_FUNC
-int tinydir_file_open(tinydir_file *file, const _tinydir_char_t *path);
-_TINYDIR_FUNC
-void _tinydir_get_ext(tinydir_file *file);
-_TINYDIR_FUNC
-int _tinydir_file_cmp(const void *a, const void *b);
-#ifndef _MSC_VER
-#ifndef _TINYDIR_USE_READDIR
-_TINYDIR_FUNC
-size_t _tinydir_dirent_buf_size(_TINYDIR_DIR *dirp);
-#endif
-#endif
-
-
-/* definitions*/
-
-_TINYDIR_FUNC
-int tinydir_open(tinydir_dir *dir, const _tinydir_char_t *path)
-{
-#ifndef _MSC_VER
-#ifndef _TINYDIR_USE_READDIR
-	int error;
-	int size;	/* using int size */
-#endif
-#else
-	_tinydir_char_t path_buf[_TINYDIR_PATH_MAX];
-#endif
-	_tinydir_char_t *pathp;
-
-	if (dir == NULL || path == NULL || _tinydir_strlen(path) == 0)
-	{
-		errno = EINVAL;
-		return -1;
-	}
-	if (_tinydir_strlen(path) + _TINYDIR_PATH_EXTRA >= _TINYDIR_PATH_MAX)
-	{
-		errno = ENAMETOOLONG;
-		return -1;
-	}
-
-	/* initialise dir */
-	dir->_files = NULL;
-#ifdef _MSC_VER
-	dir->_h = INVALID_HANDLE_VALUE;
-#else
-	dir->_d = NULL;
-#ifndef _TINYDIR_USE_READDIR
-	dir->_ep = NULL;
-#endif
-#endif
-	tinydir_close(dir);
-
-	_tinydir_strcpy(dir->path, path);
-	/* Remove trailing slashes */
-	pathp = &dir->path[_tinydir_strlen(dir->path) - 1];
-	while (pathp != dir->path && (*pathp == TINYDIR_STRING('\\') || *pathp == TINYDIR_STRING('/')))
-	{
-		*pathp = TINYDIR_STRING('\0');
-		pathp++;
-	}
-#ifdef _MSC_VER
-	_tinydir_strcpy(path_buf, dir->path);
-	_tinydir_strcat(path_buf, TINYDIR_STRING("\\*"));
-#if (defined WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP)
-	dir->_h = FindFirstFileEx(path_buf, FindExInfoStandard, &dir->_f, FindExSearchNameMatch, NULL, 0);
-#else
-	dir->_h = FindFirstFile(path_buf, &dir->_f);
-#endif
-	if (dir->_h == INVALID_HANDLE_VALUE)
-	{
-		errno = ENOENT;
-#else
-	dir->_d = _tinydir_opendir(path);
-	if (dir->_d == NULL)
-	{
-#endif
-		goto bail;
-	}
-
-	/* read first file */
-	dir->has_next = 1;
-#ifndef _MSC_VER
-#ifdef _TINYDIR_USE_READDIR
-	dir->_e = _tinydir_readdir(dir->_d);
-#else
-	/* allocate dirent buffer for readdir_r */
-	size = _tinydir_dirent_buf_size(dir->_d); /* conversion to int */
-	if (size == -1) return -1;
-	dir->_ep = (struct _tinydir_dirent*)_TINYDIR_MALLOC(size);
-	if (dir->_ep == NULL) return -1;
-
-	error = readdir_r(dir->_d, dir->_ep, &dir->_e);
-	if (error != 0) return -1;
-#endif
-	if (dir->_e == NULL)
-	{
-		dir->has_next = 0;
-	}
-#endif
-
-	return 0;
-
-bail:
-	tinydir_close(dir);
-	return -1;
-}
-
-_TINYDIR_FUNC
-int tinydir_open_sorted(tinydir_dir *dir, const _tinydir_char_t *path)
-{
-	/* Count the number of files first, to pre-allocate the files array */
-	size_t n_files = 0;
-	if (tinydir_open(dir, path) == -1)
-	{
-		return -1;
-	}
-	while (dir->has_next)
-	{
-		n_files++;
-		if (tinydir_next(dir) == -1)
-		{
-			goto bail;
-		}
-	}
-	tinydir_close(dir);
-
-	if (tinydir_open(dir, path) == -1)
-	{
-		return -1;
-	}
-
-	dir->n_files = 0;
-	dir->_files = (tinydir_file *)_TINYDIR_MALLOC(sizeof *dir->_files * n_files);
-	if (dir->_files == NULL)
-	{
-		goto bail;
-	}
-	while (dir->has_next)
-	{
-		tinydir_file *p_file;
-		dir->n_files++;
-
-		p_file = &dir->_files[dir->n_files - 1];
-		if (tinydir_readfile(dir, p_file) == -1)
-		{
-			goto bail;
-		}
-
-		if (tinydir_next(dir) == -1)
-		{
-			goto bail;
-		}
-
-		/* Just in case the number of files has changed between the first and
-		second reads, terminate without writing into unallocated memory */
-		if (dir->n_files == n_files)
-		{
-			break;
-		}
-	}
-
-	qsort(dir->_files, dir->n_files, sizeof(tinydir_file), _tinydir_file_cmp);
-
-	return 0;
-
-bail:
-	tinydir_close(dir);
-	return -1;
-}
-
-_TINYDIR_FUNC
-void tinydir_close(tinydir_dir *dir)
-{
-	if (dir == NULL)
-	{
-		return;
-	}
-
-	memset(dir->path, 0, sizeof(dir->path));
-	dir->has_next = 0;
-	dir->n_files = 0;
-	_TINYDIR_FREE(dir->_files);
-	dir->_files = NULL;
-#ifdef _MSC_VER
-	if (dir->_h != INVALID_HANDLE_VALUE)
-	{
-		FindClose(dir->_h);
-	}
-	dir->_h = INVALID_HANDLE_VALUE;
-#else
-	if (dir->_d)
-	{
-		_tinydir_closedir(dir->_d);
-	}
-	dir->_d = NULL;
-	dir->_e = NULL;
-#ifndef _TINYDIR_USE_READDIR
-	_TINYDIR_FREE(dir->_ep);
-	dir->_ep = NULL;
-#endif
-#endif
-}
-
-_TINYDIR_FUNC
-int tinydir_next(tinydir_dir *dir)
-{
-	if (dir == NULL)
-	{
-		errno = EINVAL;
-		return -1;
-	}
-	if (!dir->has_next)
-	{
-		errno = ENOENT;
-		return -1;
-	}
-
-#ifdef _MSC_VER
-	if (FindNextFile(dir->_h, &dir->_f) == 0)
-#else
-#ifdef _TINYDIR_USE_READDIR
-	dir->_e = _tinydir_readdir(dir->_d);
-#else
-	if (dir->_ep == NULL)
-	{
-		return -1;
-	}
-	if (readdir_r(dir->_d, dir->_ep, &dir->_e) != 0)
-	{
-		return -1;
-	}
-#endif
-	if (dir->_e == NULL)
-#endif
-	{
-		dir->has_next = 0;
-#ifdef _MSC_VER
-		if (GetLastError() != ERROR_SUCCESS &&
-			GetLastError() != ERROR_NO_MORE_FILES)
-		{
-			tinydir_close(dir);
-			errno = EIO;
-			return -1;
-		}
-#endif
-	}
-
-	return 0;
-}
-
-_TINYDIR_FUNC
-int tinydir_readfile(const tinydir_dir *dir, tinydir_file *file)
-{
-	if (dir == NULL || file == NULL)
-	{
-		errno = EINVAL;
-		return -1;
-	}
-#ifdef _MSC_VER
-	if (dir->_h == INVALID_HANDLE_VALUE)
-#else
-	if (dir->_e == NULL)
-#endif
-	{
-		errno = ENOENT;
-		return -1;
-	}
-	if (_tinydir_strlen(dir->path) +
-		_tinydir_strlen(
-#ifdef _MSC_VER
-			dir->_f.cFileName
-#else
-			dir->_e->d_name
-#endif
-		) + 1 + _TINYDIR_PATH_EXTRA >=
-		_TINYDIR_PATH_MAX)
-	{
-		/* the path for the file will be too long */
-		errno = ENAMETOOLONG;
-		return -1;
-	}
-	if (_tinydir_strlen(
-#ifdef _MSC_VER
-			dir->_f.cFileName
-#else
-			dir->_e->d_name
-#endif
-		) >= _TINYDIR_FILENAME_MAX)
-	{
-		errno = ENAMETOOLONG;
-		return -1;
-	}
-
-	_tinydir_strcpy(file->path, dir->path);
-	_tinydir_strcat(file->path, TINYDIR_STRING("/"));
-	_tinydir_strcpy(file->name,
-#ifdef _MSC_VER
-		dir->_f.cFileName
-#else
-		dir->_e->d_name
-#endif
-	);
-	_tinydir_strcat(file->path, file->name);
-#ifndef _MSC_VER
-#ifdef __MINGW32__
-	if (_tstat(
-#else
-	if (stat(
-#endif
-		file->path, &file->_s) == -1)
-	{
-		return -1;
-	}
-#endif
-	_tinydir_get_ext(file);
-
-	file->is_dir =
-#ifdef _MSC_VER
-		!!(dir->_f.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY);
-#else
-		S_ISDIR(file->_s.st_mode);
-#endif
-	file->is_reg =
-#ifdef _MSC_VER
-		!!(dir->_f.dwFileAttributes & FILE_ATTRIBUTE_NORMAL) ||
-		(
-			!(dir->_f.dwFileAttributes & FILE_ATTRIBUTE_DEVICE) &&
-			!(dir->_f.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) &&
-			!(dir->_f.dwFileAttributes & FILE_ATTRIBUTE_ENCRYPTED) &&
-#ifdef FILE_ATTRIBUTE_INTEGRITY_STREAM
-			!(dir->_f.dwFileAttributes & FILE_ATTRIBUTE_INTEGRITY_STREAM) &&
-#endif
-#ifdef FILE_ATTRIBUTE_NO_SCRUB_DATA
-			!(dir->_f.dwFileAttributes & FILE_ATTRIBUTE_NO_SCRUB_DATA) &&
-#endif
-			!(dir->_f.dwFileAttributes & FILE_ATTRIBUTE_OFFLINE) &&
-			!(dir->_f.dwFileAttributes & FILE_ATTRIBUTE_TEMPORARY));
-#else
-		S_ISREG(file->_s.st_mode);
-#endif
-
-	return 0;
-}
-
-_TINYDIR_FUNC
-int tinydir_readfile_n(const tinydir_dir *dir, tinydir_file *file, size_t i)
-{
-	if (dir == NULL || file == NULL)
-	{
-		errno = EINVAL;
-		return -1;
-	}
-	if (i >= dir->n_files)
-	{
-		errno = ENOENT;
-		return -1;
-	}
-
-	memcpy(file, &dir->_files[i], sizeof(tinydir_file));
-	_tinydir_get_ext(file);
-
-	return 0;
-}
-
-_TINYDIR_FUNC
-int tinydir_open_subdir_n(tinydir_dir *dir, size_t i)
-{
-	_tinydir_char_t path[_TINYDIR_PATH_MAX];
-	if (dir == NULL)
-	{
-		errno = EINVAL;
-		return -1;
-	}
-	if (i >= dir->n_files || !dir->_files[i].is_dir)
-	{
-		errno = ENOENT;
-		return -1;
-	}
-
-	_tinydir_strcpy(path, dir->_files[i].path);
-	tinydir_close(dir);
-	if (tinydir_open_sorted(dir, path) == -1)
-	{
-		return -1;
-	}
-
-	return 0;
-}
-
-/* Open a single file given its path */
-_TINYDIR_FUNC
-int tinydir_file_open(tinydir_file *file, const _tinydir_char_t *path)
-{
-	tinydir_dir dir;
-	int result = 0;
-	int found = 0;
-	_tinydir_char_t dir_name_buf[_TINYDIR_PATH_MAX];
-	_tinydir_char_t file_name_buf[_TINYDIR_FILENAME_MAX];
-	_tinydir_char_t *dir_name;
-	_tinydir_char_t *base_name;
-#if (defined _MSC_VER || defined __MINGW32__)
-	_tinydir_char_t drive_buf[_TINYDIR_PATH_MAX];
-	_tinydir_char_t ext_buf[_TINYDIR_FILENAME_MAX];
-#endif
-
-	if (file == NULL || path == NULL || _tinydir_strlen(path) == 0)
-	{
-		errno = EINVAL;
-		return -1;
-	}
-	if (_tinydir_strlen(path) + _TINYDIR_PATH_EXTRA >= _TINYDIR_PATH_MAX)
-	{
-		errno = ENAMETOOLONG;
-		return -1;
-	}
-
-	/* Get the parent path */
-#if (defined _MSC_VER || defined __MINGW32__)
-#if ((defined _MSC_VER) && (_MSC_VER >= 1400))
-		_tsplitpath_s(
-			path,
-			drive_buf, _TINYDIR_DRIVE_MAX,
-			dir_name_buf, _TINYDIR_FILENAME_MAX,
-			file_name_buf, _TINYDIR_FILENAME_MAX,
-			ext_buf, _TINYDIR_FILENAME_MAX);
-#else
-		_tsplitpath(
-			path,
-			drive_buf,
-			dir_name_buf,
-			file_name_buf,
-			ext_buf);
-#endif
-
-/* _splitpath_s not work fine with only filename and widechar support */
-#ifdef _UNICODE
-		if (drive_buf[0] == L'\xFEFE')
-			drive_buf[0] = '\0';
-		if (dir_name_buf[0] == L'\xFEFE')
-			dir_name_buf[0] = '\0';
-#endif
-
-	if (errno)
-	{
-		errno = EINVAL;
-		return -1;
-	}
-	/* Emulate the behavior of dirname by returning "." for dir name if it's
-	empty */
-	if (drive_buf[0] == '\0' && dir_name_buf[0] == '\0')
-	{
-		_tinydir_strcpy(dir_name_buf, TINYDIR_STRING("."));
-	}
-	/* Concatenate the drive letter and dir name to form full dir name */
-	_tinydir_strcat(drive_buf, dir_name_buf);
-	dir_name = drive_buf;
-	/* Concatenate the file name and extension to form base name */
-	_tinydir_strcat(file_name_buf, ext_buf);
-	base_name = file_name_buf;
-#else
-	_tinydir_strcpy(dir_name_buf, path);
-	dir_name = dirname(dir_name_buf);
-	_tinydir_strcpy(file_name_buf, path);
-	base_name =basename(file_name_buf);
-#endif
-
-	/* Open the parent directory */
-	if (tinydir_open(&dir, dir_name) == -1)
-	{
-		return -1;
-	}
-
-	/* Read through the parent directory and look for the file */
-	while (dir.has_next)
-	{
-		if (tinydir_readfile(&dir, file) == -1)
-		{
-			result = -1;
-			goto bail;
-		}
-		if (_tinydir_strcmp(file->name, base_name) == 0)
-		{
-			/* File found */
-			found = 1;
-			break;
-		}
-		tinydir_next(&dir);
-	}
-	if (!found)
-	{
-		result = -1;
-		errno = ENOENT;
-	}
-
-bail:
-	tinydir_close(&dir);
-	return result;
-}
-
-_TINYDIR_FUNC
-void _tinydir_get_ext(tinydir_file *file)
-{
-	_tinydir_char_t *period = _tinydir_strrchr(file->name, TINYDIR_STRING('.'));
-	if (period == NULL)
-	{
-		file->extension = &(file->name[_tinydir_strlen(file->name)]);
-	}
-	else
-	{
-		file->extension = period + 1;
-	}
-}
-
-_TINYDIR_FUNC
-int _tinydir_file_cmp(const void *a, const void *b)
-{
-	const tinydir_file *fa = (const tinydir_file *)a;
-	const tinydir_file *fb = (const tinydir_file *)b;
-	if (fa->is_dir != fb->is_dir)
-	{
-		return -(fa->is_dir - fb->is_dir);
-	}
-	return _tinydir_strncmp(fa->name, fb->name, _TINYDIR_FILENAME_MAX);
-}
-
-#ifndef _MSC_VER
-#ifndef _TINYDIR_USE_READDIR
-/*
-The following authored by Ben Hutchings <ben@decadent.org.uk>
-from https://womble.decadent.org.uk/readdir_r-advisory.html
-*/
-/* Calculate the required buffer size (in bytes) for directory      *
-* entries read from the given directory handle.  Return -1 if this  *
-* this cannot be done.                                              *
-*                                                                   *
-* This code does not trust values of NAME_MAX that are less than    *
-* 255, since some systems (including at least HP-UX) incorrectly    *
-* define it to be a smaller value.                                  */
-_TINYDIR_FUNC
-size_t _tinydir_dirent_buf_size(_TINYDIR_DIR *dirp)
-{
-	long name_max;
-	size_t name_end;
-	/* parameter may be unused */
-	(void)dirp;
-
-#if defined _TINYDIR_USE_FPATHCONF
-	name_max = fpathconf(dirfd(dirp), _PC_NAME_MAX);
-	if (name_max == -1)
-#if defined(NAME_MAX)
-		name_max = (NAME_MAX > 255) ? NAME_MAX : 255;
-#else
-		return (size_t)(-1);
-#endif
-#elif defined(NAME_MAX)
- 	name_max = (NAME_MAX > 255) ? NAME_MAX : 255;
-#else
-#error "buffer size for readdir_r cannot be determined"
-#endif
-	name_end = (size_t)offsetof(struct _tinydir_dirent, d_name) + name_max + 1;
-	return (name_end > sizeof(struct _tinydir_dirent) ?
-		name_end : sizeof(struct _tinydir_dirent));
-}
-#endif
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-# if defined (_MSC_VER)
-# pragma warning(pop)
-# endif
-
-#endif
@@ -119,7 +119,7 @@ retrieve the stack trace when script evaluation returns
 \fBTCL_ERROR\fR, like so:
 .PP
 .CS
-int code = Tcl_EvalEx(interp, script, -1, 0);
+int code = Tcl_Eval(interp, script);
 if (code == TCL_ERROR) {
    Tcl_Obj *options = \fBTcl_GetReturnOptions\fR(interp, code);
    Tcl_Obj *key = Tcl_NewStringObj("-errorinfo", -1);
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
+'\" 
 .TH Tcl_CallWhenDeleted 3 7.0 Tcl "Tcl Library Procedures"
 .so man.macros
 .BS
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
+'\" 
 .TH Tcl_CommandComplete 3 "" Tcl "Tcl Library Procedures"
 .so man.macros
 .BS
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
+'\" 
 .TH Tcl_Concat 3 7.5 Tcl "Tcl Library Procedures"
 .so man.macros
 .BS
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
+'\" 
 .TH Tcl_CreateFileHandler 3 8.0 Tcl "Tcl Library Procedures"
 .so man.macros
 .BS
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
+'\" 
 .TH Tcl_CreateInterp 3 7.5 Tcl "Tcl Library Procedures"
 .so man.macros
 .BS
@@ -8,7 +8,7 @@
 .so man.macros
 .BS
 .SH NAME
-Tcl_CreateObjCommand, Tcl_DeleteCommand, Tcl_DeleteCommandFromToken, Tcl_GetCommandInfo, Tcl_GetCommandInfoFromToken, Tcl_SetCommandInfo, Tcl_SetCommandInfoFromToken, Tcl_GetCommandName, Tcl_GetCommandFullName, Tcl_GetCommandFromObj, Tcl_RegisterCommandTypeName, Tcl_GetCommandTypeName \- implement new commands in C
+Tcl_CreateObjCommand, Tcl_DeleteCommand, Tcl_DeleteCommandFromToken, Tcl_GetCommandInfo, Tcl_GetCommandInfoFromToken, Tcl_SetCommandInfo, Tcl_SetCommandInfoFromToken, Tcl_GetCommandName, Tcl_GetCommandFullName, Tcl_GetCommandFromObj \- implement new commands in C
 .SH SYNOPSIS
 .nf
 \fB#include <tcl.h>\fR
@@ -42,14 +42,6 @@ void
 .sp
 Tcl_Command
 \fBTcl_GetCommandFromObj\fR(\fIinterp, objPtr\fR)
-.sp
-.VS "info cmdtype feature"
-void
-\fBTcl_RegisterCommandTypeName\fR(\fIproc, typeName\fR)
-.sp
-const char *
-\fBTcl_GetCommandTypeName\fR(\fItoken\fR)
-.VE "info cmdtype feature"
 .SH ARGUMENTS
 .AS Tcl_CmdDeleteProc *deleteProc in/out
 .AP Tcl_Interp *interp in
@@ -73,9 +65,6 @@ Pointer to structure containing various information about a
 Tcl command.
 .AP Tcl_Obj *objPtr in
 Value containing the name of a Tcl command.
-.AP "const char" *typeName in
-Indicates the name of the type of command implementation associated
-with a particular \fIproc\fR, or NULL to break the association.
 .BE
 .SH DESCRIPTION
 .PP
@@ -307,22 +296,6 @@ is appended to the value specified by \fIobjPtr\fR.
 specified by the name in a \fBTcl_Obj\fR.
 The command name is resolved relative to the current namespace.
 Returns NULL if the command is not found.
-.PP
-.VS "info cmdtype feature"
-\fBTcl_RegisterCommandTypeName\fR is used to associate a name (the
-\fItypeName\fR argument) with a particular implementation function so that it
-can then be looked up with \fBTcl_GetCommandTypeName\fR, which in turn is
-called with a command token that information is wanted for and which returns
-the name of the type that was registered for the implementation function used
-for that command. (The lookup functionality is surfaced virtually directly in Tcl via
-\fBinfo cmdtype\fR.) If there is no function registered for a particular
-function, the result will be the string literal
-.QW \fBnative\fR .
-The registration of a name can be undone by registering a mapping to NULL
-instead. The result from \fBTcl_GetCommandTypeName\fR will be exactly that
-string which was registered, and not a copy; use of a compile-time constant
-string is \fIstrongly recommended\fR.
-.VE "info cmdtype feature"
 .SH "SEE ALSO"
 Tcl_CreateCommand(3), Tcl_ResetResult(3), Tcl_SetObjResult(3)
 .SH KEYWORDS
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
+'\" 
 .TH Tcl_CreateTimerHandler 3 7.5 Tcl "Tcl Library Procedures"
 .so man.macros
 .BS
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
+'\" 
 .TH Tcl_DetachPids 3 "" Tcl "Tcl Library Procedures"
 .so man.macros
 .BS
@@ -3,7 +3,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
+'\" 
 .TH Tcl_DictObj 3 8.5 Tcl "Tcl Library Procedures"
 .so man.macros
 .BS
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
+'\" 
 .TH Tcl_DoWhenIdle 3 7.5 Tcl "Tcl Library Procedures"
 .so man.macros
 .BS
@@ -3,7 +3,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
+'\" 
 .TH Tcl_PutEnv 3 "7.5" Tcl "Tcl Library Procedures"
 .so man.macros
 .BS
@@ -134,9 +134,6 @@ finalization of Tcl's subsystems via \fBTcl_Finalize\fR at an
 appropriate time.  The argument passed to \fIproc\fR when it is
 invoked will be the exit status code (as passed to \fBTcl_Exit\fR)
 cast to a ClientData value.
-.PP
-\fBTcl_SetExitProc\fR can not be used in stub-enabled extensions. Its symbol
-entry in the stub table is deprecated and it will be removed in Tcl 9.0.
 .SH "SEE ALSO"
 exit(n)
 .SH KEYWORDS
@@ -3,7 +3,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
+'\" 
 .TH Tcl_ExprLongObj 3 8.0 Tcl "Tcl Library Procedures"
 .so man.macros
 .BS
@@ -3,7 +3,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
+'\" 
 .TH Tcl_FindExecutable 3 8.1 Tcl "Tcl Library Procedures"
 .so man.macros
 .BS
@@ -58,8 +58,6 @@ internal full path name of the executable file as computed by
 equivalent to the \fBinfo nameofexecutable\fR command.  NULL
 is returned if the internal full path name has not been
 computed or unknown.
-.PP
-\fBTcl_FindExecutable\fR can not be used in stub-enabled extensions. Its symbol
-entry in the stub table is deprecated and it will be removed in Tcl 9.0.
+
 .SH KEYWORDS
 binary, executable file
@@ -3,7 +3,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
+'\" 
 .TH Tcl_GetCwd 3 8.1 Tcl "Tcl Library Procedures"
 .so man.macros
 .BS
@@ -3,7 +3,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
+'\" 
 .TH Tcl_GetIndexFromObj 3 8.1 Tcl "Tcl Library Procedures"
 .so man.macros
 .BS
@@ -57,9 +57,6 @@ after the optional white space and sign are
 .QW \fB0x\fR
 then \fIsrc\fR is expected to be in hexadecimal form;  otherwise,
 if the first such characters are
-.QW \fB0d\fR
-then \fIsrc\fR is expected to be in decimal form; otherwise,
-if the first such characters are
 .QW \fB0o\fR
 then \fIsrc\fR is expected to be in octal form;  otherwise,
 if the first such characters are
@@ -68,8 +65,8 @@ then \fIsrc\fR is expected to be in binary form;  otherwise,
 if the first such character is
 .QW \fB0\fR
 then \fIsrc\fR
-is expected to be in octal form;  otherwise, \fIsrc\fR
-is expected to be in decimal form.
+is expected to be in octal form;  otherwise, \fIsrc\fR is
+expected to be in decimal form.
 .PP
 \fBTcl_GetDouble\fR expects \fIsrc\fR to consist of a floating-point
 number, which is:  white space;  a sign; a sequence of digits;  a
@@ -3,7 +3,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
+'\" 
 .TH Tcl_GetOpenFile 3 8.0 Tcl "Tcl Library Procedures"
 .so man.macros
 .BS
@@ -3,7 +3,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
+'\" 
 .TH Tcl_GetTime 3 8.4 Tcl "Tcl Library Procedures"
 .so man.macros
 .BS
@@ -281,7 +281,7 @@ The \fIhashKeyProc\fR member contains the address of a function called to
 calculate a hash value for the key.
 .PP
 .CS
-typedef TCL_HASH_TYPE \fBTcl_HashKeyProc\fR(
+typedef unsigned int \fBTcl_HashKeyProc\fR(
        Tcl_HashTable *\fItablePtr\fR,
        void *\fIkeyPtr\fR);
 .CE
@@ -1,7 +1,7 @@
 '\"
 '\" Copyright (c) 1998-2000 by Scriptics Corporation.
 '\" All rights reserved.
-'\"
+'\" 
 .TH Tcl_Init 3 8.0 Tcl "Tcl Library Procedures"
 .so man.macros
 .BS
@@ -3,7 +3,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
+'\" 
 .TH Tcl_InitStubs 3 8.1 Tcl "Tcl Library Procedures"
 .so man.macros
 .BS
@@ -23,11 +23,11 @@ Tcl interpreter handle.
 A version string consisting of one or more decimal numbers
 separated by dots.
 .AP int exact in
-1 means that only the particular version specified by
+Non-zero means that only the particular version specified by
 \fIversion\fR is acceptable.
-0 means that versions newer than \fIversion\fR are also
+Zero means that versions newer than \fIversion\fR are also
 acceptable as long as they have the same major version number
-as \fIversion\fR. Other bits have no effect.
+as \fIversion\fR.
 .BE
 .SH INTRODUCTION
 .PP
@@ -97,7 +97,7 @@ are provided by the C language standard.  The \fBTcl_WideInt\fR type is a
 typedef defined to be whatever signed integral type covers at least the
 64-bit integer range (-9223372036854775808 to 9223372036854775807).  Depending
 on the platform and the C compiler, the actual type might be
-\fBlong long int\fR, \fB__int64\fR, or something else.
+\fBlong int\fR, \fBlong long int\fR, \fB__int64\fR, or something else.
 The \fBmp_int\fR type is a multiple-precision integer type defined
 by the LibTomMath multiple-precision integer library.
 .PP
@@ -101,7 +101,7 @@ 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 approximately 200 characters.
+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
@@ -3,7 +3,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
+'\" 
 .TH Tcl_LimitCheck 3 8.5 Tcl "Tcl Library Procedures"
 .so man.macros
 .BS
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
+'\" 
 .TH Load 3 8.6 Tcl "Tcl Library Procedures"
 .so man.macros
 .BS
@@ -9,18 +9,18 @@
 .BS
 '\" Note:  do not modify the .SH NAME line immediately below!
 .SH NAME
-Tcl_ClassSetConstructor, Tcl_ClassSetDestructor, Tcl_MethodDeclarerClass, Tcl_MethodDeclarerObject, Tcl_MethodIsPublic, Tcl_MethodIsPrivate, Tcl_MethodIsType, Tcl_MethodName, Tcl_NewInstanceMethod, Tcl_NewMethod, Tcl_ObjectContextInvokeNext, Tcl_ObjectContextIsFiltering, Tcl_ObjectContextMethod, Tcl_ObjectContextObject, Tcl_ObjectContextSkippedArgs \- manipulate methods and method-call contexts
+Tcl_ClassSetConstructor, Tcl_ClassSetDestructor, Tcl_MethodDeclarerClass, Tcl_MethodDeclarerObject, Tcl_MethodIsPublic, Tcl_MethodIsType, Tcl_MethodName, Tcl_NewInstanceMethod, Tcl_NewMethod, Tcl_ObjectContextInvokeNext, Tcl_ObjectContextIsFiltering, Tcl_ObjectContextMethod, Tcl_ObjectContextObject, Tcl_ObjectContextSkippedArgs \- manipulate methods and method-call contexts
 .SH SYNOPSIS
 .nf
 \fB#include <tclOO.h>\fR
 .sp
 Tcl_Method
-\fBTcl_NewMethod\fR(\fIinterp, class, nameObj, flags, methodTypePtr,
-              clientData\fR)
+\fBTcl_NewMethod\fR(\fIinterp, class, nameObj, isPublic,
+              methodTypePtr, clientData\fR)
 .sp
 Tcl_Method
-\fBTcl_NewInstanceMethod\fR(\fIinterp, object, nameObj, flags, methodTypePtr,
-                      clientData\fR)
+\fBTcl_NewInstanceMethod\fR(\fIinterp, object, nameObj, isPublic,
+                      methodTypePtr, clientData\fR)
 .sp
 \fBTcl_ClassSetConstructor\fR(\fIinterp, class, method\fR)
 .sp
@@ -35,13 +35,8 @@ Tcl_Object
 Tcl_Obj *
 \fBTcl_MethodName\fR(\fImethod\fR)
 .sp
-.VS TIP500
 int
 \fBTcl_MethodIsPublic\fR(\fImethod\fR)
-.VE TIP500
-.sp
-int
-\fBTcl_MethodIsPrivate\fR(\fImethod\fR)
 .sp
 int
 \fBTcl_MethodIsType\fR(\fImethod, methodTypePtr, clientDataPtr\fR)
@@ -71,15 +66,10 @@ The class to create the method in.
 .AP Tcl_Obj *nameObj in
 The name of the method to create. Should not be NULL unless creating
 constructors or destructors.
-.AP int flags in
-A flag saying (currently) what the visibility of the method is. The supported
-public values of this flag are \fBTCL_OO_METHOD_PUBLIC\fR (which is fixed at 1
-for backward compatibility) for an exported method,
-\fBTCL_OO_METHOD_UNEXPORTED\fR (which is fixed at 0 for backward
-compatibility) for a non-exported method,
-.VS TIP500
-and \fBTCL_OO_METHOD_PRIVATE\fR for a private method.
-.VE TIP500
+.AP int isPublic in
+A flag saying what the visibility of the method is. The only supported public
+values of this flag are 0 for a non-exported method, and 1 for an exported
+method.
 .AP Tcl_MethodType *methodTypePtr in
 A description of the type of the method to create, or the type of method to
 compare against.
@@ -115,12 +105,8 @@ Given a method, the entity that declared it can be found using
 attached to (or NULL if the method is not attached to any class) and
 \fBTcl_MethodDeclarerObject\fR which returns the object that the method is
 attached to (or NULL if the method is not attached to an object). The name of
-the method can be retrieved with \fBTcl_MethodName\fR, whether the method
-is exported is retrieved with \fBTcl_MethodIsPublic\fR,
-.VS TIP500
-and whether the method is private is retrieved with \fBTcl_MethodIsPrivate\fR.
-.VE TIP500
-The type of the method
+the method can be retrieved with \fBTcl_MethodName\fR and whether the method
+is exported is retrieved with \fBTcl_MethodIsPublic\fR. The type of the method
 can also be introspected upon to a limited degree; the function
 \fBTcl_MethodIsType\fR returns whether a method is of a particular type,
 assigning the per-method \fIclientData\fR to the variable pointed to by
@@ -131,12 +117,8 @@ Methods are created by \fBTcl_NewMethod\fR and \fBTcl_NewInstanceMethod\fR,
 which
 create a method attached to a class or an object respectively. In both cases,
 the \fInameObj\fR argument gives the name of the method to create, the
-\fIflags\fR argument states whether the method should be exported
-initially
-.VS TIP500
-or be marked as a private method,
-.VE TIP500
-the \fImethodTypePtr\fR argument describes the implementation of
+\fIisPublic\fR argument states whether the method should be exported
+initially, the \fImethodTypePtr\fR argument describes the implementation of
 the method (see the \fBMETHOD TYPES\fR section below) and the \fIclientData\fR
 argument gives some implementation-specific data that is passed on to the
 implementation of the method when it is called.
@@ -1,6 +1,6 @@
 .\"
 .\" Copyright (c) 2008 by Kevin B. Kenny.
-.\" Copyright (c) 2018 by Nathan Coulter.
+.\" Copyright (c) 2018 by Nathan Coulter. 
 .\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
@@ -3,10 +3,10 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
+'\" 
 '\" Note that some of these functions do not seem to belong, but they
 '\" were all introduced with the same TIP (#139)
-'\"
+'\" 
 .TH Tcl_Namespace 3 8.5 Tcl "Tcl Library Procedures"
 .so man.macros
 .BS
@@ -4,12 +4,12 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\"
-.TH Tcl_OpenTcpClient 3 8.7 Tcl "Tcl Library Procedures"
+.TH Tcl_OpenTcpClient 3 8.0 Tcl "Tcl Library Procedures"
 .so man.macros
 .BS
 '\" Note:  do not modify the .SH NAME line immediately below!
 .SH NAME
-Tcl_OpenTcpClient, Tcl_MakeTcpClientChannel, Tcl_OpenTcpServer, Tcl_OpenTcpServerEx \- procedures to open channels using TCP sockets
+Tcl_OpenTcpClient, Tcl_MakeTcpClientChannel, Tcl_OpenTcpServer \- procedures to open channels using TCP sockets
 .SH SYNOPSIS
 .nf
 \fB#include <tcl.h> \fR
@@ -23,9 +23,6 @@ Tcl_Channel
 Tcl_Channel
 \fBTcl_OpenTcpServer\fR(\fIinterp, port, myaddr, proc, clientData\fR)
 .sp
-Tcl_Channel
-\fBTcl_OpenTcpServerEx\fR(\fIinterp, service, myaddr, flags, proc, clientData\fR)
-.sp
 .SH ARGUMENTS
 .AS Tcl_TcpAcceptProc clientData
 .AP Tcl_Interp *interp in
@@ -33,9 +30,6 @@ Tcl interpreter to use for error reporting.  If non-NULL and an
 error occurs, an error message is left in the interpreter's result.
 .AP int port in
 A port number to connect to as a client or to listen on as a server.
-.AP "const char" *service in
-A string specifying the port number to connect to as a client or to listen on as
- a server.
 .AP "const char" *host in
 A string specifying a host name or address for the remote end of the connection.
 .AP int myport in
@@ -47,9 +41,6 @@ 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 "unsigned int" flags in
-ORed combination of \fBTCL_TCPSERVER\fR flags that specify additional
-informations about the socket being created.
 .AP ClientData sock in
 Platform-specific handle for client TCP socket.
 .AP Tcl_TcpAcceptProc *proc in
@@ -139,7 +130,7 @@ for the new channel, \fIhostName\fR points to a string containing
 the name of the client host making the connection, and \fIport\fR
 will contain the client's port number.
 The new channel
-is opened for both input and output.
+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.
@@ -167,11 +158,6 @@ register it, use \fBTcl_RegisterChannel\fR.
 If one of the standard channels, \fBstdin\fR, \fBstdout\fR or \fBstderr\fR was
 previously closed, the act of creating the new channel also assigns it as a
 replacement for the standard channel.
-.SS TCL_OPENTCPSERVEREX
-.PP
-\fBTcl_OpenTcpServerEx\fR behaviour is identical to \fBTcl_OpenTcpServer\fR but
-gives more flexibility to the user by providing a mean to further customize some
-aspects of the socket via the \fIflags\fR parameter.
 .SH "PLATFORM ISSUES"
 .PP
 On Unix platforms, the socket handle is a Unix file descriptor as
@@ -7,7 +7,7 @@
 .BS
 '\"  Note:  do not modify the .SH NAME line immediately below!
 .SH NAME
-Tcl_Panic, Tcl_PanicVA, Tcl_SetPanicProc, Tcl_ConsolePanic \- report fatal error and abort
+Tcl_Panic, Tcl_PanicVA, Tcl_SetPanicProc \- report fatal error and abort
 .SH SYNOPSIS
 .nf
 \fB#include <tcl.h>\fR
@@ -21,9 +21,6 @@ void
 void
 \fBTcl_SetPanicProc\fR(\fIpanicProc\fR)
 .sp
-void
-\fBTcl_ConsolePanic\fR(\fIformat\fR, \fIarg\fR, \fIarg\fR, \fI...\fR)
-.sp
 .SH ARGUMENTS
 .AS Tcl_PanicProc *panicProc
 .AP "const char*" format in
@@ -57,14 +54,6 @@ message is sent to the debugger in stead. If the windows executable
 does not have a stderr channel (e.g. \fBwish.exe\fR), then a
 system dialog box is used to display the panic message.
 .PP
-If your application doesn't use \fBTcl_Main\fR or \fBTk_Main\fR
-and you want to implicitly use the stderr channel of your
-application's C runtime (in stead of the stderr channel of the
-C runtime used by Tcl), you can call \fBTcl_SetPanicProc\fR
-with \fBTcl_ConsolePanic\fR as its argument. On platforms which
-only have one C runtime (almost all platforms except Windows)
-\fBTcl_ConsolePanic\fR is equivalent to NULL.
-.PP
 \fBTcl_SetPanicProc\fR may be used to modify the behavior of
 \fBTcl_Panic\fR.  The \fIpanicProc\fR argument should match the
 type \fBTcl_PanicProc\fR:
@@ -93,11 +82,7 @@ have a panic message displayed the same way that panic messages from Tcl
 will be displayed.
 .PP
 \fBTcl_PanicVA\fR is the same as \fBTcl_Panic\fR except that instead of
-taking a variable number of arguments it takes an argument list. This
-function is deprecated and will be removed in Tcl 9.0.
-.PP
-This function can not be used in stub-enabled extensions. Its symbol
-entry in the stub table is deprecated and it will be removed in Tcl 9.0.
+taking a variable number of arguments it takes an argument list.
 .SH "SEE ALSO"
 abort(3), printf(3), exec(n), format(n)
 .SH KEYWORDS
@@ -3,7 +3,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
+'\" 
 .TH Tcl_ParseArgsObjv 3 8.6 Tcl "Tcl Library Procedures"
 .so man.macros
 .BS
@@ -103,8 +103,8 @@ the argument's value. The following values are acceptable values for
 \fBTCL_ARGV_CONSTANT\fR
 .
 The argument does not take any following value argument. If this argument is
-present, the \fIsrcPtr\fR field (casted to \fIint\fR) is copied to the variable
-pointed to by the \fIdstPtr\fR field. The \fIclientData\fR field is ignored.
+present, the int pointed to by the \fIsrcPtr\fR field is copied to the
+\fIdstPtr\fR field. The \fIclientData\fR field is ignored.
 .TP
 \fBTCL_ARGV_END\fR
 .
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
+'\" 
 .TH Tcl_Preserve 3 7.5 Tcl "Tcl Library Procedures"
 .so man.macros
 .BS
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
+'\" 
 .TH Tcl_PrintDouble 3 8.0 Tcl "Tcl Library Procedures"
 .so man.macros
 .BS
@@ -3,7 +3,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
+'\" 
 .TH Tcl_RecordAndEvalObj 3 8.0 Tcl "Tcl Library Procedures"
 .so man.macros
 .BS
@@ -32,6 +32,8 @@ the command at global level instead of the current stack level.
 .PP
 \fBTcl_RecordAndEvalObj\fR is invoked to record a command as an event
 on the history list and then execute it using \fBTcl_EvalObjEx\fR
+(or \fBTcl_GlobalEvalObj\fR if the \fBTCL_EVAL_GLOBAL\fR bit is set
+in \fIflags\fR).
 It returns a completion code such as \fBTCL_OK\fR just like \fBTcl_EvalObjEx\fR,
 as well as a result value containing additional information
 (a result value or error message)
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
+'\" 
 .TH Tcl_RecordAndEval 3 7.4 Tcl "Tcl Library Procedures"
 .so man.macros
 .BS
@@ -1,7 +1,6 @@
 '\"
 '\" Copyright (c) 1997 by Sun Microsystems, Inc.
 '\" Contributions from Don Porter, NIST, 2004. (not subject to US copyright)
-'\" Copyright (c) 2018 Nathan Coulter.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
@@ -10,9 +9,7 @@
 .so man.macros
 .BS
 .SH NAME
-Tcl_SaveInterpState, Tcl_RestoreInterpState, Tcl_DiscardInterpState,
-Tcl_SaveResult, Tcl_RestoreResult, Tcl_DiscardResult \- Save and restore the
-state of an an interpreter.
+Tcl_SaveInterpState, Tcl_RestoreInterpState, Tcl_DiscardInterpState, Tcl_SaveResult, Tcl_RestoreResult, Tcl_DiscardResult \- save and restore an interpreter's state
 .SH SYNOPSIS
 .nf
 \fB#include <tcl.h>\fR
@@ -33,53 +30,91 @@ int
 .SH ARGUMENTS
 .AS Tcl_InterpState savedPtr
 .AP Tcl_Interp *interp in
-The interpreter for the operation.
+Interpreter for which state should be saved.
 .AP int status in
-The return code for the state.
+Return code value to save as part of interpreter state.
 .AP Tcl_InterpState state in
-A token for saved state.
+Saved state token to be restored or discarded.
 .AP Tcl_SavedResult *savedPtr in
-A pointer to storage for saved state.
+Pointer to location where interpreter result should be saved or restored.
 .BE
 .SH DESCRIPTION
 .PP
-These routines save the state of an interpreter before a call to a routine such
-as \fBTcl_Eval\fR, and restore the state afterwards.
+These routines allows a C procedure to take a snapshot of the current
+state of an interpreter so that it can be restored after a call
+to \fBTcl_Eval\fR or some other routine that modifies the interpreter
+state.  There are two triplets of routines meant to work together.
 .PP
-\fBTcl_SaveInterpState\fR saves the parts of \fIinterp\fR that comprise the
-result of a script, including the resulting value, the return code passed as
-\fIstatus\fR, and any options such as \fB\-errorinfo\fR and \fB\-errorcode\fR.
-It returns a token for the saved state.  The interpreter result is not reset
-and no interpreter state is changed.
+The first triplet stores the snapshot of interpreter state in
+an opaque token returned by \fBTcl_SaveInterpState\fR.  That token
+value may then be passed back to one of \fBTcl_RestoreInterpState\fR
+or \fBTcl_DiscardInterpState\fR, depending on whether the interp
+state is to be restored.  So long as one of the latter two routines
+is called, Tcl will take care of memory management.
 .PP
-\fBTcl_RestoreInterpState\fR restores the state indicated by \fIstate\fR and
-returns the \fIstatus\fR originally passed in the corresponding call to
-\fBTcl_SaveInterpState\fR.
+The second triplet stores the snapshot of only the interpreter
+result (not its complete state) in memory allocated by the caller.
+These routines are passed a pointer to \fBTcl_SavedResult\fR
+that is used to store enough information to restore the interpreter result.
+\fBTcl_SavedResult\fR 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 \fB\-errorcode\fR or
+\fB\-errorinfo\fR return options, when an error is in progress).
 .PP
-If a saved state is not restored, \fBTcl_DiscardInterpState\fR must be called
-to release it.  A token used to discard or restore state must not be used
-again.
+Because the routines \fBTcl_SaveInterpState\fR,
+\fBTcl_RestoreInterpState\fR, and \fBTcl_DiscardInterpState\fR perform
+a superset of the functions provided by the other routines,
+any new code should only make use of the more powerful routines.
+The older, weaker routines \fBTcl_SaveResult\fR, \fBTcl_RestoreResult\fR,
+and \fBTcl_DiscardResult\fR continue to exist only for the sake
+of existing programs that may already be using them.
 .PP
-\fBTcl_SaveResult\fR, \fBTcl_RestoreResult\fR, and \fBTcl_DiscardResult\fR are
-deprecated.  Instead use \fBTcl_SaveInterpState\fR,
-\fBTcl_RestoreInterpState\fR, and \fBTcl_DiscardInterpState\fR, which are more
-capable.
+\fBTcl_SaveInterpState\fR takes a snapshot of those portions of
+interpreter state that make up the full result of script evaluation.
+This include the interpreter result, the return code (passed in
+as the \fIstatus\fR argument, and any return options, including
+\fB\-errorinfo\fR and \fB\-errorcode\fR when an error is in progress.
+This snapshot is returned as an opaque token of type \fBTcl_InterpState\fR.
+The call to \fBTcl_SaveInterpState\fR does not itself change the
+state of the interpreter.  Unlike \fBTcl_SaveResult\fR, it does
+not reset the interpreter.
 .PP
-\fBTcl_SaveResult\fR moves the result of \fIinterp\fR to the location
-\fIstatePtr\fR points to and returns the interpreter result to its initial
-state.  It does not save options such as \fB\-errorcode\fR or
-\fB\-errorinfo\fR.
+\fBTcl_RestoreInterpState\fR accepts a \fBTcl_InterpState\fR token
+previously returned by \fBTcl_SaveInterpState\fR and restores the
+state of the interp to the state held in that snapshot.  The return
+value of \fBTcl_RestoreInterpState\fR is the status value originally
+passed to \fBTcl_SaveInterpState\fR when the snapshot token was
+created.
 .PP
-\fBTcl_RestoreResult\fR clears any existing result or error in \fIinterp\fR and
-moves the result from \fIstatePtr\fR back to \fIinterp\fR.  \fIstatePtr\fR is
-then in an undefined state and must not be used until passed again to
+\fBTcl_DiscardInterpState\fR is called to release a \fBTcl_InterpState\fR
+token previously returned by \fBTcl_SaveInterpState\fR when that
+snapshot is not to be restored to an interp.
+.PP
+The \fBTcl_InterpState\fR token returned by \fBTcl_SaveInterpState\fR
+must eventually be passed to either \fBTcl_RestoreInterpState\fR
+or \fBTcl_DiscardInterpState\fR to avoid a memory leak.  Once
+the \fBTcl_InterpState\fR token is passed to one of them, the
+token is no longer valid and should not be used anymore.
+.PP
+\fBTcl_SaveResult\fR moves the string and value 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 value 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 state stored at \fBstatePtr\fR, which is
-then in an undefined state and must not be used until passed again to
+\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
-If a saved result is not restored, \fBTcl_DiscardResult\fR must be called to
-release it.
+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
@@ -3,7 +3,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
+'\" 
 .TH Tcl_SetErrno 3 8.3 Tcl "Tcl Library Procedures"
 .so man.macros
 .BS
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
+'\" 
 .TH Tcl_SetRecursionLimit 3 7.0 Tcl "Tcl Library Procedures"
 .so man.macros
 .BS
@@ -3,7 +3,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
+'\" 
 .TH Tcl_SignalId 3 8.3 Tcl "Tcl Library Procedures"
 .so man.macros
 .BS
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
+'\" 
 .TH Tcl_Sleep 3 7.5 Tcl "Tcl Library Procedures"
 .so man.macros
 .BS
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
+'\" 
 .TH Tcl_SplitList 3 8.0 Tcl "Tcl Library Procedures"
 .so man.macros
 .BS
@@ -3,7 +3,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
+'\" 
 .TH Tcl_SplitPath 3 7.5 Tcl "Tcl Library Procedures"
 .so man.macros
 .BS
@@ -3,7 +3,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
+'\" 
 .TH Tcl_StaticPackage 3 7.5 Tcl "Tcl Library Procedures"
 .so man.macros
 .BS
@@ -64,9 +64,6 @@ the event of an error it should set the interpreter's result 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.
-.PP
-This function can not be used in stub-enabled extensions. Its symbol
-entry in the stub table is deprecated and it will be removed in Tcl 9.0.
 .SH KEYWORDS
 initialization procedure, package, static linking
 .SH "SEE ALSO"
@@ -3,7 +3,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
+'\" 
 .TH "Standard Channels" 3 7.5 Tcl "Tcl Library Procedures"
 .so man.macros
 .BS
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
+'\" 
 .TH Tcl_StringMatch 3 8.5 Tcl "Tcl Library Procedures"
 .so man.macros
 .BS
@@ -37,7 +37,7 @@ Tcl_UniChar *
 Tcl_UniChar *
 \fBTcl_GetUnicode\fR(\fIobjPtr\fR)
 .sp
-int
+Tcl_UniChar
 \fBTcl_GetUniChar\fR(\fIobjPtr, index\fR)
 .sp
 int
@@ -204,8 +204,7 @@ where the caller does not need the length of the unicode string
 representation.
 .PP
 \fBTcl_GetUniChar\fR returns the \fIindex\fR'th character in the
-value's Unicode representation. If the index is out of range or
-it references a low surrogate preceded by a high surrogate, it returns -1;
+value's Unicode representation.
 .PP
 \fBTcl_GetRange\fR returns a newly created value comprised of the
 characters between \fIfirst\fR and \fIlast\fR (inclusive) in the
@@ -3,7 +3,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
+'\" 
 .TH Tcl_SubstObj 3 8.4 Tcl "Tcl Library Procedures"
 .so man.macros
 .BS
@@ -1,8 +1,8 @@
-'\"
+'\" 
 '\" Copyright (c) 1992-1999 Karl Lehenbauer and Mark Diekhans.
 '\" Copyright (c) 2000 by Scriptics Corporation.
 '\" All rights reserved.
-'\"
+'\" 
 .TH TCL_MEM_DEBUG 3 8.1 Tcl "Tcl Library Procedures"
 .so man.macros
 .BS
@@ -28,10 +28,10 @@ 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.
-Secondly, the first word is used to locate a routine to
-carry out the command, and the remaining words of the command are
-passed to that routine.
-The routine is free to interpret each of its words
+Secondly, 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.
@@ -3,7 +3,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
+'\" 
 .TH TclZlib 3 8.6 Tcl "Tcl Library Procedures"
 .so man.macros
 .BS
@@ -189,8 +189,6 @@ procedure (if any) returns.  In non-interactive mode, after
 \fBTcl_Main\fR evaluates the startup script, and the main loop
 procedure (if any) returns, \fBTcl_Main\fR will also evaluate
 the \fBexit\fR command.
-.PP
-This function can not be used in stub-enabled extensions.
 .SH "SEE ALSO"
 tclsh(1), Tcl_GetStdChannel(3), Tcl_StandardChannels(3), Tcl_AppInit(3),
 exit(n), encoding(n)
@@ -45,9 +45,7 @@ int
 .AP Tcl_Condition *condPtr in
 A condition variable, which must be associated with a mutex lock.
 .AP Tcl_Mutex *mutexPtr in
-.VS TIP509
-A recursive mutex lock.
-.VE TIP509
+A mutex lock.
 .AP "const Tcl_Time" *timePtr in
 A time limit on the condition wait.  NULL to wait forever.
 Note that a polling value of 0 seconds does not make much sense.
@@ -142,12 +140,8 @@ 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.
 A mutex can be destroyed after its use by calling \fBTcl_MutexFinalize\fR.
-.VS TIP509
-Mutexes are reentrant: they can be locked several times from the same
-thread. However there must be exactly one call to
-\fBTcl_MutexUnlock\fR for each call to \fBTcl_MutexLock\fR in order
-for a thread to release a mutex completely.
-.VE TIP509
+The result of locking a mutex twice from the same thread is undefined.
+On some platforms it will result in a deadlock.
 The \fBTcl_MutexLock\fR, \fBTcl_MutexUnlock\fR and \fBTcl_MutexFinalize\fR
 procedures are defined as empty macros if not compiling with threads enabled.
 For declaration of mutexes the \fBTCL_DECLARE_MUTEX\fR macro should be used.
@@ -13,13 +13,13 @@ Tcl_UniCharToUpper, Tcl_UniCharToLower, Tcl_UniCharToTitle, Tcl_UtfToUpper, Tcl_
 .nf
 \fB#include <tcl.h>\fR
 .sp
-int
+Tcl_UniChar
 \fBTcl_UniCharToUpper\fR(\fIch\fR)
 .sp
-int
+Tcl_UniChar
 \fBTcl_UniCharToLower\fR(\fIch\fR)
 .sp
-int
+Tcl_UniChar
 \fBTcl_UniCharToTitle\fR(\fIch\fR)
 .sp
 int
@@ -78,5 +78,11 @@ turns each character in the string into its lower-case equivalent.
 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
@@ -48,7 +48,7 @@ int
 .SH ARGUMENTS
 .AS int ch
 .AP int ch in
-The Unicode character to be examined.
+The Tcl_UniChar to be examined.
 .BE

 .SH DESCRIPTION
@@ -63,7 +63,7 @@ const char *
 const char *
 \fBTcl_UtfPrev\fR(\fIsrc, start\fR)
 .sp
-int
+Tcl_UniChar
 \fBTcl_UniCharAtIndex\fR(\fIsrc, index\fR)
 .sp
 const char *
@@ -121,8 +121,8 @@ case-insensitive (1).

 .SH DESCRIPTION
 .PP
-These routines convert between UTF-8 strings and Unicode characters.  An
-Unicode character represented as an unsigned, fixed-size
+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 \fBTCL_UTF_MAX\fR bytes.  A multibyte UTF-8
 sequence consists of a lead byte followed by some number of trail bytes.
@@ -130,13 +130,9 @@ sequence consists of a lead byte followed by some number of trail bytes.
 \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 character \fIch\fR as a UTF-8 string
+\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. If ch is a high surrogate (range U+D800 - U+DBFF), then
-the return value will be 1 and a single byte in the range 0xF0 - 0xF4
-will be stored. If you still want to produce UTF-8 output for it (even
-though knowing it's an illegal code-point on its own), just call
-\fBTcl_UniCharToUtf\fR again specifying ch = -1.
+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
@@ -144,9 +140,6 @@ 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
-a byte in the range 0x80 - 0x9F, \fBTcl_UtfToUniChar\fR assumes the
-cp1252 encoding, stores the corresponding Tcl_UniChar in \fI*chPtr\fR
-and returns 1. If the input is otherwise
 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.
@@ -207,7 +200,7 @@ of \fIlength\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 Unicode character has been seen.
+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
@@ -215,12 +208,12 @@ returns the number of Tcl_UniChars that are represented by the UTF-8 string
 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 occurrence of the Unicode character \fIch\fR
+returns a pointer to the first occurrence 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 occurrence of the Unicode character \fIch\fR
+returns a pointer to the last occurrence 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
@@ -1,77 +0,0 @@
-'\"
-'\" Copyright (c) 2018 Donal K. Fellows
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
-.TH abstract n 0.3 TclOO "TclOO Commands"
-.so man.macros
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-oo::abstract \- a class that does not allow direct instances of itself
-.SH SYNOPSIS
-.nf
-package require TclOO
-
-\fBoo::abstract\fI method \fR?\fIarg ...\fR?
-.fi
-.SH "CLASS HIERARCHY"
-.nf
-\fBoo::object\fR
-   \(-> \fBoo::class\fR
-       \(-> \fBoo::abstract\fR
-.fi
-.BE
-.SH DESCRIPTION
-Abstract classes are classes that can contain definitions, but which cannot be
-directly manufactured; they are intended to only ever be inherited from and
-instantiated indirectly. The characteristic methods of \fBoo::class\fR
-(\fBcreate\fR and \fBnew\fR) are not exported by an instance of
-\fBoo::abstract\fR.
-.PP
-Note that \fBoo::abstract\fR is not itself an instance of \fBoo::abstract\fR.
-.SS CONSTRUCTOR
-The \fBoo::abstract\fR class does not define an explicit constructor; this
-means that it is effectively the same as the constructor of the
-\fBoo::class\fR class.
-.SS DESTRUCTOR
-The \fBoo::abstract\fR class does not define an explicit destructor;
-destroying an instance of it is just like destroying an ordinary class (and
-will destroy all its subclasses).
-.SS "EXPORTED METHODS"
-The \fBoo::abstract\fR class defines no new exported methods.
-.SS "NON-EXPORTED METHODS"
-The \fBoo::abstract\fR class explicitly states that \fBcreate\fR,
-\fBcreateWithNamespace\fR, and \fBnew\fR are unexported.
-.SH EXAMPLES
-.PP
-This example defines a simple class hierarchy and creates a new instance of
-it. It then invokes a method of the object before destroying the hierarchy and
-showing that the destruction is transitive.
-.PP
-.CS
-\fBoo::abstract\fR create fruit {
-    method eat {} {
-        puts "yummy!"
-    }
-}
-oo::class create banana {
-    superclass fruit
-    method peel {} {
-        puts "skin now off"
-    }
-}
-set b [banana \fBnew\fR]
-$b peel              \fI\(-> prints 'skin now off'\fR
-$b eat               \fI\(-> prints 'yummy!'\fR
-set f [fruit new]    \fI\(-> error 'unknown method "new"...'\fR
-.CE
-.SH "SEE ALSO"
-oo::define(n), oo::object(n)
-.SH KEYWORDS
-abstract class, class, metaclass, object
-.\" Local variables:
-.\" mode: nroff
-.\" fill-column: 78
-.\" End:
@@ -20,11 +20,6 @@ Append all of the \fIvalue\fR arguments to the current value
 of variable \fIvarName\fR.  If \fIvarName\fR does not exist,
 it is given a value equal to the concatenation of all the
 \fIvalue\fR arguments.
-.VS TIP508
-If \fIvarName\fR indicate an element that does not exist of an array that has
-a default value set, the concatenation of the default value and all the
-\fIvalue\fR arguments will be stored in the array element.
-.VE TIP508
 The result of this command is the new value stored in variable
 \fIvarName\fR.
 This command provides an efficient way to build up long
@@ -49,7 +44,6 @@ puts $var
 concat(n), lappend(n)
 .SH KEYWORDS
 append, variable
-.\" Local variables:
-.\" mode: nroff
-.\" fill-column: 78
-.\" End:
+'\" Local Variables:
+'\" mode: nroff
+'\" End:
@@ -5,7 +5,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\"
-.TH array n 8.7 Tcl "Tcl Built-In Commands"
+.TH array n 8.3 Tcl "Tcl Built-In Commands"
 .so man.macros
 .BS
 '\" Note:  do not modify the .SH NAME line immediately below!
@@ -36,53 +36,6 @@ with an empty name, since the return value from
 \fBarray nextelement\fR will not indicate whether the search
 has been completed.
 .TP
-\fBarray default \fIsubcommand arrayName args...\fR
-.VS TIP508
-Manages the default value of the array. Arrays initially have no default
-value, but this command allows you to set one; the default value will be
-returned when reading from an element of the array \fIarrayName\fR if the read
-would otherwise result in an error. Note that this may cause the \fBappend\fR,
-\fBdict\fR, \fBincr\fR and \fBlappend\fR commands to change their behavior in
-relation to non-existing array elements.
-.RS
-.PP
-The \fIsubcommand\fR argument controls what exact operation will be performed
-on the default value of \fIarrayName\fR. Supported \fIsubcommand\fRs are:
-.VE TIP508
-.TP
-\fBarray default exists \fIarrayName\fR
-.VS TIP508
-This returns a boolean value indicating whether a default value has been set
-for the array \fIarrayName\fR. Returns a false value if \fIarrayName\fR does
-not exist. Raises an error if \fIarrayName\fR is an existing variable that is
-not an array.
-.VE TIP508
-.TP
-\fBarray default get \fIarrayName\fR
-.VS TIP508
-This returns the current default value for the array \fIarrayName\fR.  Raises
-an error if \fIarrayName\fR is an existing variable that is not an array, or
-if \fIarrayName\fR is an array without a default value.
-.VE TIP508
-.TP
-\fBarray default set \fIarrayName value\fR
-.VS TIP508
-This sets the default value for the array \fIarrayName\fR to \fIvalue\fR.
-Returns the empty string. Raises an error if \fIarrayName\fR is an existing
-variable that is not an array, or if \fIarrayName\fR is an illegal name for an
-array. If \fIarrayName\fR does not currently exist, it is created as an empty
-array as well as having its default value set.
-.VE TIP508
-.TP
-\fBarray default unset \fIarrayName\fR
-.VS TIP508
-This removes the default value for the array \fIarrayName\fR and returns the
-empty string. Does nothing if \fIarrayName\fR does not have a default
-value. Raises an error if \fIarrayName\fR is an existing variable that is not
-an array.
-.VE TIP508
-.RE
-.TP
 \fBarray donesearch \fIarrayName searchId\fR
 This command terminates an array search and destroys all the
 state associated with that search.  \fISearchId\fR indicates
@@ -94,15 +47,6 @@ been the return value from a previous invocation of
 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 for {\fIkeyVariable valueVariable\fB} \fIarrayName body\fP
-The first argument is a two element list of variable names for the
-key and value of each entry in the array.  The second argument is the
-array name to iterate over.  The third argument is the body to execute
-for each key and value returned.
-The ordering of the returned keys is undefined.
-If an array element is deleted or a new array element is inserted during
-the \fIarray for\fP process, the command will terminate with an error.
-.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
@@ -241,7 +185,3 @@ foreach color [lsort [\fBarray names\fR colorcount]] {
 list(n), string(n), variable(n), trace(n), foreach(n)
 .SH KEYWORDS
 array, element names, search
-.\" Local variables:
-.\" mode: nroff
-.\" fill-column: 78
-.\" End:
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
+'\" 
 .TH break n "" Tcl "Tcl Built-In Commands"
 .so man.macros
 .BS
@@ -1,88 +0,0 @@
-'\"
-'\" Copyright (c) 2018 Donal K. Fellows
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
-.TH callback n 0.3 TclOO "TclOO Commands"
-.so man.macros
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-callback, mymethod \- generate callbacks to methods
-.SH SYNOPSIS
-.nf
-package require TclOO
-
-\fBcallback\fR \fImethodName\fR ?\fIarg ...\fR?
-\fBmymethod\fR \fImethodName\fR ?\fIarg ...\fR?
-.fi
-.BE
-.SH DESCRIPTION
-The \fBcallback\fR command,
-'\" Based on notes in the tcllib docs, we know the provenance of mymethod
-also called \fBmymethod\fR for compatibility with the ooutil and snit packages
-of Tcllib,
-and which should only be used from within the context of a call to a method
-(i.e. inside a method, constructor or destructor body) is used to generate a
-script fragment that will invoke the method, \fImethodName\fR, on the current
-object (as reported by \fBself\fR) when executed. Any additional arguments
-provided will be provided as leading arguments to the callback. The resulting
-script fragment shall be a proper list.
-.PP
-Note that it is up to the caller to ensure that the current object is able to
-handle the call of \fImethodName\fR; this command does not check that.
-\fImethodName\fR may refer to any exported or unexported method, but may not
-refer to a private method as those can only be invoked directly from within
-methods. If there is no such method present at the point when the callback is
-invoked, the standard \fBunknown\fR method handler will be called.
-.SH EXAMPLE
-This is a simple echo server class. The \fBcallback\fR command is used in two
-places, to arrange for the incoming socket connections to be handled by the
-\fIAccept\fR method, and to arrange for the incoming bytes on those
-connections to be handled by the \fIReceive\fR method.
-.PP
-.CS
-oo::class create EchoServer {
-    variable server clients
-    constructor {port} {
-        set server [socket -server [\fBcallback\fR Accept] $port]
-        set clients {}
-    }
-    destructor {
-        chan close $server
-        foreach client [dict keys $clients] {
-            chan close $client
-        }
-    }
-
-    method Accept {channel clientAddress clientPort} {
-        dict set clients $channel [dict create \e
-                address $clientAddress port $clientPort]
-        chan event $channel readable [\fBcallback\fR Receive $channel]
-    }
-    method Receive {channel} {
-        if {[chan gets $channel line] >= 0} {
-            my echo $channel $line
-        } else {
-            chan close $channel
-            dict unset clients $channel
-        }
-    }
-
-    method echo {channel line} {
-        dict with clients $channel {
-            chan puts $channel \e
-                    [format {[%s:%d] %s} $address $port $line]
-        }
-    }
-}
-.CE
-.SH "SEE ALSO"
-chan(n), fileevent(n), my(n), self(n), socket(n), trace(n)
-.SH KEYWORDS
-callback, object
-.\" Local Variables:
-.\" mode: nroff
-.\" fill-column: 78
-.\" End:
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
+'\" 
 .TH case n 7.0 Tcl "Tcl Built-In Commands"
 .so man.macros
 .BS
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
+'\" 
 .TH cd n "" Tcl "Tcl Built-In Commands"
 .so man.macros
 .BS
@@ -41,7 +41,3 @@ current one:
 filename(n), glob(n), pwd(n)
 .SH KEYWORDS
 working directory
-'\" Local Variables:
-'\" mode: nroff
-'\" fill-column: 78
-'\" End:
@@ -1,78 +0,0 @@
-'\"
-'\" Copyright (c) 2011-2015 Andreas Kupries
-'\" Copyright (c) 2018 Donal K. Fellows
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
-.TH classvariable n 0.3 TclOO "TclOO Commands"
-.so man.macros
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-classvariable \- create link from local variable to variable in class
-.SH SYNOPSIS
-.nf
-package require TclOO
-
-\fBclassvariable\fR \fIvariableName\fR ?\fI...\fR?
-.fi
-.BE
-.SH DESCRIPTION
-The \fBclassvariable\fR command is available within methods. It takes a series
-of one or more variable names and makes them available in the method's scope;
-those variable names must not be qualified and must not refer to array
-elements. The originating scope for the variables is the namespace of the
-class that the method was defined by. In other words, the referenced variables
-are shared between all instances of that class.
-.PP
-Note: This command is equivalent to the command \fBtypevariable\fR provided by
-the snit package in tcllib for approximately the same purpose. If used in a
-method defined directly on a class instance (e.g., through the
-\fBoo::objdefine\fR \fBmethod\fR definition) this is very much like just
-using:
-.PP
-.CS
-namespace upvar [namespace current] $var $var
-.CE
-.PP
-for each variable listed to \fBclassvariable\fR.
-.SH EXAMPLE
-This class counts how many instances of it have been made.
-.PP
-.CS
-oo::class create Counted {
-    initialise {
-        variable count 0
-    }
-
-    variable number
-    constructor {} {
-        \fBclassvariable\fR count
-        set number [incr count]
-    }
-
-    method report {} {
-        \fBclassvariable\fR count
-        puts "This is instance $number of $count"
-    }
-}
-
-set a [Counted new]
-set b [Counted new]
-$a report
-        \fI\(-> This is instance 1 of 2\fR
-set c [Counted new]
-$b report
-        \fI\(-> This is instance 2 of 3\fR
-$c report
-        \fI\(-> This is instance 3 of 3\fR
-.CE
-.SH "SEE ALSO"
-global(n), namespace(n), oo::class(n), oo::define(n), upvar(n), variable(n)
-.SH KEYWORDS
-class, class variable, variable
-.\" Local Variables:
-.\" mode: nroff
-.\" fill-column: 78
-.\" End:
@@ -89,9 +89,10 @@ have 59 or 61 seconds.
 .TP
 \fIunit\fR
 One of the words, \fBseconds\fR, \fBminutes\fR, \fBhours\fR,
-\fBdays\fR, \fBweekdays\fR, \fBweeks\fR, \fBmonths\fR, or \fByears\fR.
-Used in conjunction with \fIcount\fR to identify an interval of time,
-for example, \fI3 seconds\fR or \fI1 year\fR.
+\fBdays\fR, \fBweeks\fR, \fBmonths\fR, or \fByears\fR, or
+any unique prefix of such a word. Used in conjunction with \fIcount\fR
+to identify an interval of time, for example, \fI3 seconds\fR or
+\fI1 year\fR.
 .SS "OPTIONS"
 .TP
 \fB\-base\fR time
@@ -174,7 +175,8 @@ given as its first argument.  The remaining arguments (other than the
 possible \fB\-timezone\fR, \fB\-locale\fR and \fB\-gmt\fR options)
 are integers and keywords in alternation, where the keywords are chosen
 from \fBseconds\fR, \fBminutes\fR, \fBhours\fR,
-\fBdays\fR, \fBweekdays\fR, \fBweeks\fR, \fBmonths\fR, or \fByears\fR.
+\fBdays\fR, \fBweeks\fR, \fBmonths\fR, or \fByears\fR, or
+any unique prefix of such a word.
 .PP
 Addition of seconds, minutes and hours is fairly straightforward;
 the given time increment (times sixty for minutes, or 3600 for hours)
@@ -211,8 +213,7 @@ the given time to a calendar day and time of day in the appropriate
 time zone and locale.  The requisite number of days (weeks are converted
 to days by multiplying by seven) is added to the calendar day, and
 the date and time are then converted back to a count of seconds from
-the epoch time.  The \fBweekdays\fR keyword is similar to \fBdays\fR,
-with the only difference that weekends - Saturdays and Sundays - are skipped.
+the epoch time.
 .PP
 Adding and subtracting a given number of days across the point that
 the time changes at the start or end of summer time (Daylight Saving Time)
@@ -464,7 +465,7 @@ a Daylight Saving Time change skips over that time, or an ambiguous
 time because a Daylight Saving Time change skips back so that the clock
 observes the given time twice, and no time zone specifier (\fB%z\fR
 or \fB%Z\fR) is present in the format, the time is interpreted as
-if the clock had not changed.
+if the clock had not changed. 
 .SH "FORMAT GROUPS"
 .PP
 The following format groups are recognized by the \fBclock scan\fR and
@@ -886,46 +887,40 @@ The \fIinputString\fR argument consists of zero or more specifications of the
 following form:
 .TP
 \fItime\fR
-.
-A time of day, which is of the form:
-.QW "\fIhh\fR?\fB:\fImm\fR?\fB:\fIss\fR?? ?\fImeridian\fR? ?\fIzone\fR?"
-or
-.QW "\fBhhmm \fR?\fBmeridian\fR? ?\fBzone\fR?" .
-If no \fImeridian\fR is specified, \fIhh\fR is interpreted on
+A time of day, which is of the form: \fBhh?:mm?:ss?? ?meridian? ?zone?\fR
+or \fBhhmm ?meridian? ?zone?\fR
+If no meridian is specified, \fBhh\fR is interpreted on
 a 24-hour clock.
 .TP
 \fIdate\fR
-.
 A specific month and day with optional year.  The
 acceptable formats are
-.QW "\fImm\fB/\fIdd\fR?\fB/\fIyy\fR?" ,
-.QW "\fImonthname dd\fR?\fB, \fIyy\fR?" ,
-.QW "\fIday\fB, \fIdd monthname \fR?\fIyy\fR?" ,
-.QW "\fIdd monthname yy\fR" ,
-.QW "?\fICC\fR?\fIyymmdd\fR" ,
+.QW "\fBmm/dd\fR?\fB/yy\fR?" ,
+.QW "\fBmonthname dd\fR?\fB, yy\fR?" ,
+.QW "\fBday, dd monthname \fR?\fByy\fR?" ,
+.QW "\fBdd monthname yy\fR" ,
+.QW "?\fBCC\fR?\fByymmdd\fR" ,
 and
-.QW "\fIdd\fB-\fImonthname\fB-\fR?\fICC\fR?\fIyy\fR" .
+.QW "\fBdd-monthname-\fR?\fBCC\fR?\fByy\fR" .
 The default year is the current year.  If the year is less
 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.
 .TP
 \fIISO 8601 point-in-time\fR
-.
 An ISO 8601 point-in-time specification, such as
 .QW \fICCyymmdd\fBT\fIhhmmss\fR,
 where \fBT\fR is the literal
 .QW T ,
 .QW "\fICCyymmdd hhmmss\fR" ,
 or
-.QW \fICCyymmdd\fBT\fIhh\fB:\fImm\fB:\fIss\fR .
+.QW \fICCyymmdd\fBT\fIhh:mm:ss\fR .
 Note that only these three formats are accepted.
 The command does \fInot\fR accept the full range of point-in-time
 specifications specified in ISO8601.  Other formats can be recognized by
 giving an explicit \fB\-format\fR option to the \fBclock scan\fR command.
 .TP
 \fIrelative time\fR
-.
 A specification relative to the current time.  The format is \fBnumber
 unit\fR. Acceptable units are \fByear\fR, \fBfortnight\fR,
 \fBmonth\fR, \fBweek\fR, \fBday\fR,
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
+'\" 
 .TH close n 7.5 Tcl "Tcl Built-In Commands"
 .so man.macros
 .BS
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
+'\" 
 .TH concat n 8.3 Tcl "Tcl Built-In Commands"
 .so man.macros
 .BS
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
+'\" 
 .TH continue n "" Tcl "Tcl Built-In Commands"
 .so man.macros
 .BS
@@ -23,7 +23,7 @@ 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.
-Continue exceptions are also handled in a few other situations, such
+Catch exceptions are also handled in a few other situations, such
 as the \fBcatch\fR command and the outermost scripts of procedure
 bodies.
 .SH EXAMPLE
@@ -1,217 +0,0 @@
-'\"
-'\" Copyright (c) 2014-2018 Donal K. Fellows.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
-.TH "cookiejar" n 0.1 http "Tcl Bundled Packages"
-.so man.macros
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-cookiejar \- Implementation of the Tcl http package cookie jar protocol
-.SH SYNOPSIS
-.nf
-\fBpackage require\fR \fBcookiejar\fR ?\fB0.1\fR?
-
-\fB::http::cookiejar configure\fR ?\fIoptionName\fR? ?\fIoptionValue\fR?
-\fB::http::cookiejar create\fR \fIname\fR ?\fIfilename\fR?
-\fB::http::cookiejar new\fR ?\fIfilename\fR?
-
-\fIcookiejar\fR \fBdestroy\fR
-\fIcookiejar\fR \fBforceLoadDomainData\fR
-\fIcookiejar\fR \fBgetCookies\fR \fIprotocol host path\fR
-\fIcookiejar\fR \fBstoreCookie\fR \fIoptions\fR
-\fIcookiejar\fR \fBlookup\fR ?\fIhost\fR? ?\fIkey\fR?
-.fi
-.SH DESCRIPTION
-.PP
-The cookiejar package provides an implementation of the http package's cookie
-jar protocol using an SQLite database. It provides one main command,
-\fB::http::cookiejar\fR, which is a TclOO class that should be instantiated to
-create a cookie jar that manages a particular HTTP session.
-.PP
-The database management policy can be controlled at the package level by the
-\fBconfigure\fR method on the \fB::http::cookiejar\fR class object:
-.TP
-\fB::http::cookiejar configure\fR ?\fIoptionName\fR? ?\fIoptionValue\fR?
-.
-If neither \fIoptionName\fR nor \fIoptionValue\fR are supplied, this returns a
-copy of the configuration as a Tcl dictionary. If just \fIoptionName\fR is
-supplied, just the value of the named option is returned. If both
-\fIoptionName\fR and \fIoptionValue\fR are given, the named option is changed
-to be the given value.
-.RS
-.PP
-Supported options are:
-.TP
-\fB\-domainfile \fIfilename\fR
-.
-A file (defaulting to within the cookiejar package) with a description of the
-list of top-level domains (e.g., \fB.com\fR or \fB.co.jp\fR). Such domains
-\fImust not\fR accept cookies set upon them. Note that the list of such
-domains is both security-sensitive and \fInot\fR constant and should be
-periodically refetched. Cookie jars maintain their own cache of the domain
-list.
-.TP
-\fB\-domainlist \fIurl\fR
-.
-A URL to fetch the list of top-level domains (e.g., \fB.com\fR or
-\fB.co.jp\fR) from.  Such domains \fImust not\fR accept cookies set upon
-them. Note that the list of such domains is both security-sensitive and
-\fInot\fR constant and should be periodically refetched. Cookie jars maintain
-their own cache of the domain list.
-.TP
-\fB\-domainrefresh \fIintervalMilliseconds\fR
-.
-The number of milliseconds between checks of the \fI\-domainlist\fR for new
-domains.
-.TP
-\fB\-loglevel \fIlevel\fR
-.
-The logging level of this package. The logging level must be (in order of
-decreasing verbosity) one of \fBdebug\fR, \fBinfo\fR, \fBwarn\fR, or
-\fBerror\fR.
-.TP
-\fB\-offline \fIflag\fR
-.
-Allows the cookie managment engine to be placed into offline mode. In offline
-mode, the list of domains is read immediately from the file configured in the
-\fB\-domainfile\fR option, and the \fB\-domainlist\fR option is not used; it
-also makes the \fB\-domainrefresh\fR option be effectively ignored.
-.TP
-\fB\-purgeold \fIintervalMilliseconds\fR
-.
-The number of milliseconds between checks of the database for expired
-cookies; expired cookies are deleted.
-.TP
-\fB\-retain \fIcookieCount\fR
-.
-The maximum number of cookies to retain in the database.
-.TP
-\fB\-vacuumtrigger \fIdeletionCount\fR
-.
-A count of the number of persistent cookie deletions to go between vacuuming
-the database.
-.RE
-.PP
-Cookie jar instances may be made with any of the standard TclOO instance
-creation methods (\fBcreate\fR or \fBnew\fR).
-.TP
-\fB::http::cookiejar new\fR ?\fIfilename\fR?
-.
-If a \fIfilename\fR argument is provided, it is the name of a file containing
-an SQLite database that will contain the persistent cookies maintained by the
-cookie jar; the database will be created if the file does not already
-exist. If \fIfilename\fR is not supplied, the database will be held entirely within
-memory, which effectively forces all cookies within it to be session cookies.
-.SS "INSTANCE METHODS"
-.PP
-The following methods are supported on the instances:
-.TP
-\fIcookiejar\fR \fBdestroy\fR
-.
-This is the standard TclOO destruction method. It does \fInot\fR delete the
-SQLite database if it is written to disk. Callers are responsible for ensuring
-that the cookie jar is not in use by the http package at the time of
-destruction.
-.TP
-\fIcookiejar\fR \fBforceLoadDomainData\fR
-.
-This method causes the cookie jar to immediately load (and cache) the domain
-list data. The domain list will be loaded from the \fB\-domainlist\fR
-configured a the package level if that is enabled, and otherwise will be
-obtained from the \fB\-domainfile\fR configured at the package level.
-.TP
-\fIcookiejar\fR \fBgetCookies\fR \fIprotocol host path\fR
-.
-This method obtains the cookies for a particular HTTP request. \fIThis
-implements the http cookie jar protocol.\fR
-.TP
-\fIcookiejar\fR \fBpolicyAllow\fR \fIoperation domain path\fR
-.
-This method is called by the \fBstoreCookie\fR method to get a decision on
-whether to allow \fIoperation\fR to be performed for the \fIdomain\fR and
-\fIpath\fR. This is checked immediately before the database is updated but
-after the built-in security checks are done, and should return a boolean
-value; if the value is false, the operation is rejected and the database is
-not modified. The supported \fIoperation\fRs are:
-.RS
-.TP
-\fBdelete\fR
-.
-The \fIdomain\fR is seeking to delete a cookie.
-.TP
-\fBsession\fR
-.
-The \fIdomain\fR is seeking to create or update a session cookie.
-.TP
-\fBset\fR
-.
-The \fIdomain\fR is seeking to create or update a persistent cookie (with a
-defined lifetime).
-.PP
-The default implementation of this method just returns true, but subclasses of
-this class may impose their own rules.
-.RE
-.TP
-\fIcookiejar\fR \fBstoreCookie\fR \fIoptions\fR
-.
-This method stores a single cookie from a particular HTTP response. Cookies
-that fail security checks are ignored. \fIThis implements the http cookie jar
-protocol.\fR
-.TP
-\fIcookiejar\fR \fBlookup\fR ?\fIhost\fR? ?\fIkey\fR?
-.
-This method looks a cookie by exact host (or domain) matching. If neither
-\fIhost\fR nor \fIkey\fR are supplied, the list of hosts for which a cookie is
-stored is returned. If just \fIhost\fR (which may be a hostname or a domain
-name) is supplied, the list of cookie keys stored for that host is returned.
-If both \fIhost\fR and \fIkey\fR are supplied, the value for that key is
-returned; it is an error if no such host or key match exactly.
-.SH "EXAMPLES"
-.PP
-The simplest way of using a cookie jar is to just permanently configure it at
-the start of the application.
-.PP
-.CS
-package require http
-\fBpackage require cookiejar\fR
-
-set cookiedb ~/.tclcookies.db
-http::configure -cookiejar [\fBhttp::cookiejar new\fR $cookiedb]
-
-# No further explicit steps are required to use cookies
-set tok [http::geturl http://core.tcl.tk/]
-.CE
-.PP
-To only allow a particular domain to use cookies, perhaps because you only
-want to enable a particular host to create and manipulate sessions, create a
-subclass that imposes that policy.
-.PP
-.CS
-package require http
-\fBpackage require cookiejar\fR
-
-oo::class create MyCookieJar {
-    superclass \fBhttp::cookiejar\fR
-
-    method \fBpolicyAllow\fR {operation domain path} {
-        return [expr {$domain eq "my.example.com"}]
-    }
-}
-
-set cookiedb ~/.tclcookies.db
-http::configure -cookiejar [MyCookieJar new $cookiedb]
-
-# No further explicit steps are required to use cookies
-set tok [http::geturl http://core.tcl.tk/]
-.CE
-.SH "SEE ALSO"
-http(n), oo::class(n), sqlite3(n)
-.SH KEYWORDS
-cookie, internet, security policy, www
-'\" Local Variables:
-'\" mode: nroff
-'\" fill-column: 78
-'\" End:
@@ -33,9 +33,9 @@ as the empty string, a new name is chosen. Names, unless specified, are
 chosen with the same algorithm used by the \fBnew\fR method of
 \fBoo::class\fR.
 .VE TIP473
-The copied object will be of the same class as the source object, and will have
-all its per-object methods copied. If it is a class, it will also have all the
-class methods in the class copied, but it will not have any of its instances
+The copied object will be of the same class as the source object, and will have 
+all its per-object methods copied. If it is a class, it will also have all the 
+class methods in the class copied, but it will not have any of its instances 
 copied.
 .PP
 .VS
@@ -3,7 +3,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
+'\" 
 .TH coroutine n 8.6 Tcl "Tcl Built-In Commands"
 .so man.macros
 .BS
@@ -1,5 +1,5 @@
 '\"
-'\" Copyright (c) 2007-2018 Donal K. Fellows
+'\" Copyright (c) 2007 Donal K. Fellows
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
@@ -34,36 +34,11 @@ either the \fIdefScript\fR argument or by the \fIsubcommand\fR and following
 \fIarg\fR arguments; when the second is present, it is exactly as if all the
 arguments from \fIsubcommand\fR onwards are made into a list and that list is
 used as the \fIdefScript\fR argument.
-.PP
-Note that the constructor for \fBoo::class\fR will call \fBoo::define\fR on
-the script argument that it is provided. This is a convenient way to create
-and define a class in one step.
-.SH "CONFIGURING CLASSES"
+.SS "CONFIGURING CLASSES"
 .PP
 The following commands are supported in the \fIdefScript\fR for
 \fBoo::define\fR, each of which may also be used in the \fIsubcommand\fR form:
 .TP
-\fBclassmethod\fI name\fR ?\fIargList bodyScrip\fR?
-.VS TIP478
-This creates a class method, or (if \fIargList\fR and \fIbodyScript\fR are
-omitted) promotes an existing method on the class object to be a class
-method. The \fIname\fR, \fIargList\fR and \fIbodyScript\fR arguments are as in
-the \fBmethod\fR definition, below.
-.RS
-.PP
-Class methods can be called on either the class itself or on the instances of
-that class. When they are called, the current object (see the \fBsel\fR and
-\fBmy\fR commands) is the class on which they are called or the class of the
-instance on which they are called, depending on whether they are called on the
-class or an instance of the class, respectively. If called on a subclass or
-instance of the subclass, the current object is the subclass.
-.PP
-In a private definition context, the methods as invoked on classes are
-\fInot\fR private, but the methods as invoked on instances of classes are
-private.
-.RE
-.VE TIP478
-.TP
 \fBconstructor\fI argList bodyScript\fR
 .
 This creates or updates the constructor for a class. The formal arguments to
@@ -74,11 +49,13 @@ namespace of the constructor will be a namespace that is unique to the object
 being constructed. Within the constructor, the \fBnext\fR command should be
 used to call the superclasses' constructors. If \fIbodyScript\fR is the empty
 string, the constructor will be deleted.
-.RS
-.PP
-Classes do not need to have a constructor defined. If none is specified, the
-superclass's constructor will be used instead.
-.RE
+.TP
+\fBdeletemethod\fI name\fR ?\fIname ...\fR?
+.
+This deletes each of the methods called \fIname\fR from a class. The methods
+must have previously existed in that class. Does not affect the superclasses
+of the class, nor does it affect the subclasses or instances of the class
+(except when they have a call chain through the class being modified).
 .TP
 \fBdestructor\fI bodyScript\fR
 .
@@ -104,6 +81,19 @@ class being defined. Note that the methods themselves may be actually defined
 by a superclass; subclass exports override superclass visibility, and may in
 turn be overridden by instances.
 .TP
+\fBfilter\fR ?\fI\-slotOperation\fR? ?\fImethodName ...\fR?
+.VS
+This slot (see \fBSLOTTED DEFINITIONS\fR below)
+.VE
+sets or updates the list of method names that are used to guard whether
+method call to instances of the class may be called and what the method's
+results are. Each \fImethodName\fR names a single filtering method (which may
+be exposed or not exposed); it is not an error for a non-existent method to be
+named since they may be defined by subclasses.
+.VS
+By default, this slot works by appending.
+.VE
+.TP
 \fBforward\fI name cmdName \fR?\fIarg ...\fR?
 .
 This creates or updates a forwarded method called \fIname\fR. The method is
@@ -115,24 +105,8 @@ fully-qualified, the command will be searched for in each object's namespace,
 using the instances' namespace's path, or by looking in the global namespace.
 The method will be exported if \fIname\fR starts with a lower-case letter, and
 non-exported otherwise.
-.RS
-.PP
-.VS TIP500
-If in a private definition context (see the \fBprivate\fR definition command,
-below), this command creates private forwarded methods.
-.VE TIP500
-.RE
 .TP
-\fBinitialise\fI script\fR
-.TP
-\fBinitialize\fI script\fR
-.VS TIP478
-This evaluates \fIscript\fR in a context which supports local variables and
-where the current namespace is the instance namespace of the class object
-itself. This is useful for setting up, e.g., class-scoped variables.
-.VE TIP478
-.TP
-\fBmethod\fI name \fR?\fIoption\fR? \fIargList bodyScript\fR
+\fBmethod\fI name argList bodyScript\fR
 .
 This creates or updates a method that is implemented as a procedure-like
 script. The name of the method is \fIname\fR, the formal arguments to the
@@ -142,44 +116,32 @@ the body of the method is evaluated, the current namespace of the method will
 be a namespace that is unique to the current object. The method will be
 exported if \fIname\fR starts with a lower-case letter, and non-exported
 otherwise; this behavior can be overridden via \fBexport\fR and
-\fBunexport\fR
-.VS  TIP519
-or by specifying \fB\-export\fR, \fB\-private\fR or \fB\-unexport\fR in the
-optional parameter \fIoption\fR.
-.VE TIP519
-.RS
-.PP
-.VS TIP500
-If in a private definition context (see the \fBprivate\fR definition command,
-below) or if the \fB\-private\fR flag is given for \fIoption\fR, this command
-creates private procedure-like methods.
-.VE TIP500
-.RE
+\fBunexport\fR.
 .TP
-\fBprivate \fIcmd arg...\fR
+\fBmixin\fR ?\fI\-slotOperation\fR? ?\fIclassName ...\fR?
+.VS
+This slot (see \fBSLOTTED DEFINITIONS\fR below)
+.VE
+sets or updates the list of additional classes that are to be mixed into
+all the instances of the class being defined. Each \fIclassName\fR argument
+names a single class that is to be mixed in.
+.VS
+By default, this slot works by replacement.
+.VE
 .TP
-\fBprivate \fIscript\fR
+\fBrenamemethod\fI fromName toName\fR
 .
-.VS TIP500
-This evaluates the \fIscript\fR (or the list of command and arguments given by
-\fIcmd\fR and \fIarg\fRs) in a context where the definitions made on the
-current class will be private definitions.
-.RS
-.PP
-The following class definition commands are affected by \fBprivate\fR:
-\fBforward\fR, \fBmethod\fR, \fBself\fR, and \fBvariable\fR. Nesting
-\fBprivate\fR inside \fBprivate\fR has no cumulative effect; the innermost
-definition context is just a private definition context. All other definition
-commands have no difference in behavior when used in a private definition
-context.
-.RE
-.VE TIP500
+This renames the method called \fIfromName\fR in a class to \fItoName\fR. The
+method must have previously existed in the class, and \fItoName\fR must not
+previously refer to a method in that class. Does not affect the superclasses
+of the class, nor does it affect the subclasses or instances of the class
+(except when they have a call chain through the class being modified). Does
+not change the export status of the method; if it was exported before, it will
+be afterwards.
 .TP
 \fBself\fI subcommand arg ...\fR
 .TP
 \fBself\fI script\fR
-.TP
-\fBself\fR
 .
 This command is equivalent to calling \fBoo::objdefine\fR on the class being
 defined (see \fBCONFIGURING OBJECTS\fR below for a description of the
@@ -189,29 +151,20 @@ and
 .QW "\fBoo::define \fIcls \fBself \fIsubcommand ...\fR"
 operates identically to
 .QW "\fBoo::objdefine \fIcls subcommand ...\fR" .
-.RS
-.PP
-.VS TIP470
-If no arguments at all are used, this gives the name of the class currently
-being configured.
-.VE TIP470
-.VS TIP500
-If in a private definition context (see the \fBprivate\fR definition command,
-below), the definitions on the class object will also be made in a private
-definition context.
-.VE TIP500
-.RE
 .TP
 \fBsuperclass\fR ?\fI\-slotOperation\fR? ?\fIclassName ...\fR?
-.
+.VS
 This slot (see \fBSLOTTED DEFINITIONS\fR below)
+.VE
 allows the alteration of the superclasses of the class being defined.
 Each \fIclassName\fR argument names one class that is to be a superclass of
 the defined class. Note that objects must not be changed from being classes to
 being non-classes or vice-versa, that an empty parent class is equivalent to
 \fBoo::object\fR, and that the parent classes of \fBoo::object\fR and
 \fBoo::class\fR may not be modified.
+.VS
 By default, this slot works by replacement.
+.VE
 .TP
 \fBunexport\fI name \fR?\fIname ...\fR?
 .
@@ -223,212 +176,24 @@ actually defined by a superclass; subclass unexports override superclass
 visibility, and may be overridden by instance unexports.
 .TP
 \fBvariable\fR ?\fI\-slotOperation\fR? ?\fIname ...\fR?
-.
+.VS
 This slot (see \fBSLOTTED DEFINITIONS\fR below) arranges for each of the named
 variables to be automatically made
 available in the methods, constructor and destructor declared by the class
 being defined. Each variable name must not have any namespace
 separators and must not look like an array access. All variables will be
-actually present in the namespace of the instance object on which the method
-is executed. Note
+actually present in the instance object on which the method is executed. Note
 that the variable lists declared by a superclass or subclass are completely
 disjoint, as are variable lists declared by instances; the list of variable
 names is just for methods (and constructors and destructors) declared by this
 class. By default, this slot works by appending.
-.RS
-.PP
-.VS TIP500
-If in a private definition context (see the \fBprivate\fR definition command,
-below), this slot manipulates the list of private variable bindings for this
-class. In a private variable binding, the name of the variable within the
-instance object is different to the name given in the definition; the name
-used in the definition is the name that you use to access the variable within
-the methods of this class, and the name of the variable in the instance
-namespace has a unique prefix that makes accidental use from other classes
-extremely unlikely.
-.VE TIP500
-.RE
-.SS "ADVANCED CLASS CONFIGURATION OPTIONS"
-.PP
-The following definitions are also supported, but are not required in simple
-programs:
-.TP
-\fBdefinitionnamespace\fR ?\fIkind\fR? \fInamespaceName\fR
-.VS TIP524
-This allows control over what namespace will be used by the \fBoo::define\fR
-and \fBoo::objdefine\fR commands to look up the definition commands they
-use. When any object has a definition operation applied to it, \fIthe class that
-it is an instance of\fR (and its superclasses and mixins) is consulted for
-what definition namespace to use. \fBoo::define\fR gets the class definition
-namespace, and \fB::oo::objdefine\fR gets the instance definition namespace,
-but both otherwise use the identical lookup operation.
-.RS
-.PP
-This sets the definition namespace of kind \fIkind\fR provided by the current
-class to \fInamespaceName\fR. The \fInamespaceName\fR must refer to a
-currently existing namespace, or must be the empty string (to stop the current
-class from having such a namespace connected). The \fIkind\fR, if supplied,
-must be either \fB\-class\fR (the default) or \fB\-instance\fR to specify the
-whether the namespace for use with \fBoo::define\fR or \fBoo::objdefine\fR
-respectively is being set.
-.PP
-The class \fBoo::object\fR has its instance namespace locked to
-\fB::oo::objdefine\fR, and the class \fBoo::class\fR has its class namespace
-locked to \fB::oo::define\fR. A consequence of this is that effective use of
-this feature for classes requires the definition of a metaclass.
-.RE
-.VE TIP524
-.TP
-\fBdeletemethod\fI name\fR ?\fIname ...\fR?
-.
-This deletes each of the methods called \fIname\fR from a class. The methods
-must have previously existed in that class. Does not affect the superclasses
-of the class, nor does it affect the subclasses or instances of the class
-(except when they have a call chain through the class being modified) or the
-class object itself.
-.TP
-\fBfilter\fR ?\fI\-slotOperation\fR? ?\fImethodName ...\fR?
-.
-This slot (see \fBSLOTTED DEFINITIONS\fR below)
-sets or updates the list of method names that are used to guard whether
-method call to instances of the class may be called and what the method's
-results are. Each \fImethodName\fR names a single filtering method (which may
-be exposed or not exposed); it is not an error for a non-existent method to be
-named since they may be defined by subclasses.
-By default, this slot works by appending.
-.TP
-\fBmixin\fR ?\fI\-slotOperation\fR? ?\fIclassName ...\fR?
-.
-This slot (see \fBSLOTTED DEFINITIONS\fR below)
-sets or updates the list of additional classes that are to be mixed into
-all the instances of the class being defined. Each \fIclassName\fR argument
-names a single class that is to be mixed in.
-By default, this slot works by replacement.
-.TP
-\fBrenamemethod\fI fromName toName\fR
-.
-This renames the method called \fIfromName\fR in a class to \fItoName\fR. The
-method must have previously existed in the class, and \fItoName\fR must not
-previously refer to a method in that class. Does not affect the superclasses
-of the class, nor does it affect the subclasses or instances of the class
-(except when they have a call chain through the class being modified), or the
-class object itself. Does
-not change the export status of the method; if it was exported before, it will
-be afterwards.
-.SH "CONFIGURING OBJECTS"
+.VE
+.SS "CONFIGURING OBJECTS"
 .PP
 The following commands are supported in the \fIdefScript\fR for
 \fBoo::objdefine\fR, each of which may also be used in the \fIsubcommand\fR
 form:
 .TP
-\fBexport\fI name \fR?\fIname ...\fR?
-.
-This arranges for each of the named methods, \fIname\fR, to be exported
-(i.e. usable outside the object through the object's command) by the object
-being defined. Note that the methods themselves may be actually defined by a
-class or superclass; object exports override class visibility.
-.TP
-\fBforward\fI name cmdName \fR?\fIarg ...\fR?
-.
-This creates or updates a forwarded object method called \fIname\fR. The
-method is defined be forwarded to the command called \fIcmdName\fR, with
-additional arguments, \fIarg\fR etc., added before those arguments specified
-by the caller of the method. Forwarded methods should be deleted using the
-\fBmethod\fR subcommand. The method will be exported if \fIname\fR starts with
-a lower-case letter, and non-exported otherwise.
-.RS
-.PP
-.VS TIP500
-If in a private definition context (see the \fBprivate\fR definition command,
-below), this command creates private forwarded methods.
-.VE TIP500
-.RE
-.TP
-\fBmethod\fI name \fR?\fIoption\fR? \fIargList bodyScript\fR
-.
-This creates, updates or deletes an object method. The name of the method is
-\fIname\fR, the formal arguments to the method (defined using the same format
-as for the Tcl \fBproc\fR command) will be \fIargList\fR, and the body of the
-method will be \fIbodyScript\fR. When the body of the method is evaluated, the
-current namespace of the method will be a namespace that is unique to the
-object. The method will be exported if \fIname\fR starts with a lower-case
-letter, and non-exported otherwise;
-.VS  TIP519
-this can be overridden by specifying \fB\-export\fR, \fB\-private\fR or
-\fB\-unexport\fR in the optional parameter \fIoption\fR, or via the
-\fBexport\fR and \fBunexport\fR definitions.
-.VE TIP519
-.RS
-.PP
-.VS TIP500
-If in a private definition context (see the \fBprivate\fR definition command,
-below) or if the \fB\-private\fR flag is given for \fIoption\fR, this command
-creates private procedure-like methods.
-.VE TIP500
-.RE
-.TP
-\fBmixin\fR ?\fI\-slotOperation\fR? ?\fIclassName ...\fR?
-.
-This slot (see \fBSLOTTED DEFINITIONS\fR below)
-sets or updates a per-object list of additional classes that are to be
-mixed into the object. Each argument, \fIclassName\fR, names a single class
-that is to be mixed in.
-By default, this slot works by replacement.
-.TP
-\fBprivate \fIcmd arg...\fR
-.TP
-\fBprivate \fIscript\fR
-.VS TIP500
-This evaluates the \fIscript\fR (or the list of command and arguments given by
-\fIcmd\fR and \fIarg\fRs) in a context where the definitions made on the
-current object will be private definitions.
-.RS
-.PP
-The following class definition commands are affected by \fBprivate\fR:
-\fBforward\fR, \fBmethod\fR, and \fBvariable\fR. Nesting \fBprivate\fR inside
-\fBprivate\fR has no cumulative effect; the innermost definition context is
-just a private definition context. All other definition commands have no
-difference in behavior when used in a private definition context.
-.RE
-.VE TIP500
-.TP
-\fBunexport\fI name \fR?\fIname ...\fR?
-.
-This arranges for each of the named methods, \fIname\fR, to be not exported
-(i.e. not usable outside the object through the object's command, but instead
-just through the \fBmy\fR command visible in the object's context) by the
-object being defined. Note that the methods themselves may be actually defined
-by a class; instance unexports override class visibility.
-.TP
-\fBvariable\fR ?\fI\-slotOperation\fR? ?\fIname ...\fR?
-.
-This slot (see \fBSLOTTED DEFINITIONS\fR below) arranges for each of the named
-variables to be automatically made available in the methods declared by the
-object being defined.  Each variable name must not have any namespace
-separators and must not look like an array access. All variables will be
-actually present in the namespace of the object on which the method is
-executed. Note that the
-variable lists declared by the classes and mixins of which the object is an
-instance are completely disjoint; the list of variable names is just for
-methods declared by this object. By default, this slot works by appending.
-.RS
-.PP
-.VS TIP500
-If in a private definition context (see the \fBprivate\fR definition command,
-below), this slot manipulates the list of private variable bindings for this
-object.  In a private variable binding, the name of the variable within the
-instance object is different to the name given in the definition; the name
-used in the definition is the name that you use to access the variable within
-the methods of this instance object, and the name of the variable in the
-instance namespace has a unique prefix that makes accidental use from
-superclass methods extremely unlikely.
-.VE TIP500
-.RE
-.SS "ADVANCED OBJECT CONFIGURATION OPTIONS"
-.PP
-The following definitions are also supported, but are not required in simple
-programs:
-.TP
 \fBclass\fI className\fR
 .
 This allows the class of an object to be changed after creation. Note that the
@@ -438,77 +203,107 @@ well be in an inconsistent state unless additional configuration work is done.
 \fBdeletemethod\fI name\fR ?\fIname ...\fR
 .
 This deletes each of the methods called \fIname\fR from an object. The methods
-must have previously existed in that object (e.g., because it was created
-through \fBoo::objdefine method\fR). Does not affect the classes that the
-object is an instance of, or remove the exposure of those class-provided
-methods in the instance of that class.
+must have previously existed in that object. Does not affect the classes that
+the object is an instance of.
+.TP
+\fBexport\fI name \fR?\fIname ...\fR?
+.
+This arranges for each of the named methods, \fIname\fR, to be exported
+(i.e. usable outside the object through the object's command) by the object
+being defined. Note that the methods themselves may be actually defined by a
+class or superclass; object exports override class visibility.
 .TP
 \fBfilter\fR ?\fI\-slotOperation\fR? ?\fImethodName ...\fR?
-.
+.VS
 This slot (see \fBSLOTTED DEFINITIONS\fR below)
+.VE
 sets or updates the list of method names that are used to guard whether a
 method call to the object may be called and what the method's results are.
 Each \fImethodName\fR names a single filtering method (which may be exposed or
 not exposed); it is not an error for a non-existent method to be named. Note
 that the actual list of filters also depends on the filters set upon any
 classes that the object is an instance of.
+.VS
 By default, this slot works by appending.
+.VE
+.TP
+\fBforward\fI name cmdName \fR?\fIarg ...\fR?
+.
+This creates or updates a forwarded object method called \fIname\fR. The
+method is defined be forwarded to the command called \fIcmdName\fR, with
+additional arguments, \fIarg\fR etc., added before those arguments specified
+by the caller of the method. Forwarded methods should be deleted using the
+\fBmethod\fR subcommand. The method will be exported if \fIname\fR starts with
+a lower-case letter, and non-exported otherwise.
+.TP
+\fBmethod\fI name argList bodyScript\fR
+.
+This creates, updates or deletes an object method. The name of the method is
+\fIname\fR, the formal arguments to the method (defined using the same format
+as for the Tcl \fBproc\fR command) will be \fIargList\fR, and the body of the
+method will be \fIbodyScript\fR. When the body of the method is evaluated, the
+current namespace of the method will be a namespace that is unique to the
+object. The method will be exported if \fIname\fR starts with a lower-case
+letter, and non-exported otherwise.
+.TP
+\fBmixin\fR ?\fI\-slotOperation\fR? ?\fIclassName ...\fR?
+.VS
+This slot (see \fBSLOTTED DEFINITIONS\fR below)
+.VE
+sets or updates a per-object list of additional classes that are to be
+mixed into the object. Each argument, \fIclassName\fR, names a single class
+that is to be mixed in.
+.VS
+By default, this slot works by replacement.
+.VE
 .TP
 \fBrenamemethod\fI fromName toName\fR
 .
 This renames the method called \fIfromName\fR in an object to \fItoName\fR.
 The method must have previously existed in the object, and \fItoName\fR must
 not previously refer to a method in that object. Does not affect the classes
-that the object is an instance of and cannot rename in an instance object the
-methods provided by those classes (though a \fBoo::objdefine forward\fRed
-method may provide an equivalent capability). Does not change the export
-status of the method; if it was exported before, it will be afterwards.
+that the object is an instance of. Does not change the export status of the
+method; if it was exported before, it will be afterwards.
 .TP
-\fBself \fR
-.VS TIP470
-This gives the name of the object currently being configured.
-.VE TIP470
-.SH "PRIVATE METHODS"
-.VS TIP500
-When a class or instance has a private method, that private method can only be
-invoked from within methods of that class or instance. Other callers of the
-object's methods \fIcannot\fR invoke private methods, it is as if the private
-methods do not exist. However, a private method of a class \fIcan\fR be
-invoked from the class's methods when those methods are being used on another
-instance object; this means that a class can use them to coordinate behaviour
-between several instances of itself without interfering with how other
-classes (especially either subclasses or superclasses) interact. Private
-methods precede all mixed in classes in the method call order (as reported by
-\fBself call\fR).
-.VE TIP500
+\fBunexport\fI name \fR?\fIname ...\fR?
+.
+This arranges for each of the named methods, \fIname\fR, to be not exported
+(i.e. not usable outside the object through the object's command, but instead
+just through the \fBmy\fR command visible in the object's context) by the
+object being defined. Note that the methods themselves may be actually defined
+by a class; instance unexports override class visibility.
+.TP
+\fBvariable\fR ?\fI\-slotOperation\fR? ?\fIname ...\fR?
+.VS
+This slot (see \fBSLOTTED DEFINITIONS\fR below) arranges for each of the named
+variables to be automatically made available in the methods declared by the
+object being defined.  Each variable name must not have any namespace
+separators and must not look like an array access. All variables will be
+actually present in the object on which the method is executed. Note that the
+variable lists declared by the classes and mixins of which the object is an
+instance are completely disjoint; the list of variable names is just for
+methods declared by this object. By default, this slot works by appending.
 .SH "SLOTTED DEFINITIONS"
 Some of the configurable definitions of a class or object are \fIslotted
 definitions\fR. This means that the configuration is implemented by a slot
 object, that is an instance of the class \fBoo::Slot\fR, which manages a list
 of values (class names, variable names, etc.) that comprises the contents of
-the slot. The class defines five operations (as methods) that may be done on
+the slot. The class defines three operations (as methods) that may be done on
 the slot:
+.VE
 .TP
 \fIslot\fR \fB\-append\fR ?\fImember ...\fR?
-.
+.VS
 This appends the given \fImember\fR elements to the slot definition.
+.VE
 .TP
 \fIslot\fR \fB\-clear\fR
-.
+.VS
 This sets the slot definition to the empty list.
-.TP
-\fIslot\fR \fB\-prepend\fR ?\fImember ...\fR?
-.VS TIP516
-This prepends the given \fImember\fR elements to the slot definition.
-.VE TIP516
-.TP
-\fIslot\fR \fB\-remove\fR ?\fImember ...\fR?
-.VS TIP516
-This removes the given \fImember\fR elements from the slot definition.
-.VE TIP516
+.VE
 .TP
 \fIslot\fR \fB\-set\fR ?\fImember ...\fR?
-.
+.VS
 This replaces the slot definition with the given \fImember\fR elements.
 .PP
 A consequence of this is that any use of a slot's default operation where the
@@ -521,55 +316,20 @@ which is forwarded to the default operation of the slot (thus, for the class
 slot, this is forwarded to
 .QW "\fBmy \-append\fR" ),
 and these methods which provide the implementation interface:
+.VE
 .TP
 \fIslot\fR \fBGet\fR
-.
-Returns a list that is the current contents of the slot, but does not modify
-the slot. This method must always be called from a stack frame created by a
-call to \fBoo::define\fR or \fBoo::objdefine\fR. This method \fIshould not\fR
-return an error unless it is called from outside a definition context or with
-the wrong number of arguments.
-.RS
-.PP
-.VS TIP516
-The elements of the list should be fully resolved, if that is a meaningful
-concept to the slot.
-.VE TIP516
-.RE
-.TP
-\fIslot\fR \fBResolve\fR \fIslotElement\fR
-.VS TIP516
-Returns \fIslotElement\fR with a resolution operation applied to it, but does
-not modify the slot. For slots of simple strings, this is an operation that
-does nothing, whereas for slots of classes, this maps a class name to its
-fully-qualified class name.  This method must always be called from a stack
-frame created by a call to \fBoo::define\fR or \fBoo::objdefine\fR.  This
-method \fIshould not\fR return an error unless it is called from outside a
-definition context or with the wrong number of arguments; unresolvable
-arguments should be returned as is (as not all slot operations strictly
-require that values are resolvable to work).
-.RS
-.PP
-Implementations \fIshould not\fR enforce uniqueness and ordering constraints
-in this method; that is the responsibility of the \fBSet\fR method.
-.RE
-.VE TIP516
+.VS
+Returns a list that is the current contents of the slot. This method must
+always be called from a stack frame created by a call to \fBoo::define\fR or
+\fBoo::objdefine\fR.
+.VE
 .TP
 \fIslot\fR \fBSet \fIelementList\fR
-.
+.VS
 Sets the contents of the slot to the list \fIelementList\fR and returns the
 empty string. This method must always be called from a stack frame created by
-a call to \fBoo::define\fR or \fBoo::objdefine\fR. This method may return an
-error if it rejects the change to the slot contents (e.g., because of invalid
-values) as well as if it is called from outside a definition context or with
-the wrong number of arguments.
-.RS
-.PP
-This method \fImay\fR reorder and filter the elements if this is necessary in
-order to satisfy the underlying constraints of the slot. (For example, slots
-of classes enforce a uniqueness constraint that places each element in the
-earliest location in the slot that it can.)
-.RE
+a call to \fBoo::define\fR or \fBoo::objdefine\fR.
 .PP
 The implementation of these methods is slot-dependent (and responsible for
 accessing the correct part of the class or object definition). Slots also have
@@ -577,14 +337,7 @@ an unknown method handler to tie all these pieces together, and they hide
 their \fBdestroy\fR method so that it is not invoked inadvertently. It is
 \fIrecommended\fR that any user changes to the slot mechanism be restricted to
 defining new operations whose names start with a hyphen.
-.PP
-.VS TIP516
-Most slot operations will initially \fBResolve\fR their argument list, combine
-it with the results of the \fBGet\fR method, and then \fBSet\fR the result.
-Some operations omit one or both of the first two steps; omitting the third
-would result in an idempotent read-only operation (but the standard mechanism
-for reading from slots is via \fBinfo class\fR and \fBinfo object\fR).
-.VE TIP516
+.VE
 .SH EXAMPLES
 This example demonstrates how to use both forms of the \fBoo::define\fR and
 \fBoo::objdefine\fR commands (they work in the same way), as well as
@@ -641,138 +394,6 @@ oo::class create B {
 inst m1              \fI\(-> prints "red brick"\fR
 inst m2              \fI\(-> prints "blue brick"\fR
 .CE
-.PP
-.VS TIP478
-This example shows how to create and use class variables. It is a class that
-counts how many instances of itself have been made.
-.PP
-.CS
-oo::class create Counted
-\fBoo::define\fR Counted {
-    \fBinitialise\fR {
-        variable count 0
-    }
-
-    \fBvariable\fR number
-    \fBconstructor\fR {} {
-        classvariable count
-        set number [incr count]
-    }
-
-    \fBmethod\fR report {} {
-        classvariable count
-        puts "This is instance $number of $count"
-    }
-}
-
-set a [Counted new]
-set b [Counted new]
-$a report
-        \fI\(-> This is instance 1 of 2\fR
-set c [Counted new]
-$b report
-        \fI\(-> This is instance 2 of 3\fR
-$c report
-        \fI\(-> This is instance 3 of 3\fR
-.CE
-.PP
-This example demonstrates how to use class methods. (Note that the constructor
-for \fBoo::class\fR calls \fBoo::define\fR on the class.)
-.PP
-.CS
-oo::class create DBTable {
-    \fBclassmethod\fR find {description} {
-        puts "DB: locate row from [self] matching $description"
-        return [my new]
-    }
-    \fBclassmethod\fR insert {description} {
-        puts "DB: create row in [self] matching $description"
-        return [my new]
-    }
-    \fBmethod\fR update {description} {
-        puts "DB: update row [self] with $description"
-    }
-    \fBmethod\fR delete {} {
-        puts "DB: delete row [self]"
-        my destroy; # Just delete the object, not the DB row
-    }
-}
-
-oo::class create Users {
-    \fBsuperclass\fR DBTable
-}
-oo::class create Groups {
-    \fBsuperclass\fR DBTable
-}
-
-set u1 [Users insert "username=abc"]
-        \fI\(-> DB: create row from ::Users matching username=abc\fR
-set u2 [Users insert "username=def"]
-        \fI\(-> DB: create row from ::Users matching username=def\fR
-$u2 update "group=NULL"
-        \fI\(-> DB: update row ::oo::Obj124 with group=NULL\fR
-$u1 delete
-        \fI\(-> DB: delete row ::oo::Obj123\fR
-set g [Group find "groupname=webadmins"]
-        \fI\(-> DB: locate row ::Group with groupname=webadmins\fR
-$g update "emailaddress=admins"
-        \fI\(-> DB: update row ::oo::Obj125 with emailaddress=admins\fR
-.CE
-.VE TIP478
-.PP
-.VS TIP524
-This example shows how to make a custom definition for a class. Note that it
-explicitly includes delegation to the existing definition commands via
-\fBnamespace path\fR.
-.PP
-.CS
-namespace eval myDefinitions {
-    # Delegate to existing definitions where not overridden
-    namespace path \fB::oo::define\fR
-
-    # A custom type of method
-    proc exprmethod {name arguments body} {
-        tailcall \fBmethod\fR $name $arguments [list expr $body]
-    }
-
-    # A custom way of building a constructor
-    proc parameters args {
-        uplevel 1 [list \fBvariable\fR {*}$args]
-        set body [join [lmap a $args {
-            string map [list VAR $a] {
-                set [my varname VAR] [expr {double($VAR)}]
-            }
-        }] ";"]
-        tailcall \fBconstructor\fR $args $body
-    }
-}
-
-# Bind the namespace into a (very simple) metaclass for use
-oo::class create exprclass {
-    \fBsuperclass\fR oo::class
-    \fBdefinitionnamespace\fR myDefinitions
-}
-
-# Use the custom definitions
-exprclass create quadratic {
-    parameters a b c
-    exprmethod evaluate {x} {
-        ($a * $x**2) + ($b * $x) + $c
-    }
-}
-
-# Showing the resulting class and object in action
-quadratic create quad 1 2 3
-for {set x 0} {$x <= 4} {incr x} {
-    puts [format "quad(%d) = %.2f" $x [quad evaluate $x]]
-}
-        \fI\(-> quad(0) = 3.00\fR
-        \fI\(-> quad(1) = 6.00\fR
-        \fI\(-> quad(2) = 11.00\fR
-        \fI\(-> quad(3) = 18.00\fR
-        \fI\(-> quad(4) = 27.00\fR
-.CE
-.VE TIP524
 .SH "SEE ALSO"
 next(n), oo::class(n), oo::object(n)
 .SH KEYWORDS
@@ -27,11 +27,6 @@ key maps to in the dictionary value contained in the given variable,
 writing the resulting dictionary value back to that variable.
 Non-existent keys are treated as if they map to an empty string. The
 updated dictionary value is returned.
-.VS TIP508
-If \fIdictionaryVarable\fR indicates an element that does not exist of an
-array that has a default value set, the default value and will be used as the
-value of the dictionary prior to the appending operation.
-.VE TIP508
 .TP
 \fBdict create \fR?\fIkey value ...\fR?
 .
@@ -129,11 +124,6 @@ resulting dictionary value back to that variable. Non-existent keys
 are treated as if they map to 0. It is an error to increment a value
 for an existing key if that value is not an integer. The updated
 dictionary value is returned.
-.VS TIP508
-If \fIdictionaryVarable\fR indicates an element that does not exist of an
-array that has a default value set, the default value and will be used as the
-value of the dictionary prior to the incrementing operation.
-.VE TIP508
 .TP
 \fBdict info \fIdictionaryValue\fR
 .
@@ -159,11 +149,6 @@ keys are treated as if they map to an empty list, and it is legal for
 there to be no items to append to the list. It is an error for the
 value that the key maps to to not be representable as a list. The
 updated dictionary value is returned.
-.VS TIP508
-If \fIdictionaryVarable\fR indicates an element that does not exist of an
-array that has a default value set, the default value and will be used as the
-value of the dictionary prior to the list-appending operation.
-.VE TIP508
 .TP
 \fBdict map \fR{\fIkeyVariable valueVariable\fR} \fIdictionaryValue body\fR
 .
@@ -221,11 +206,6 @@ value and places an updated dictionary value in that variable
 containing a mapping from the given key to the given value. When
 multiple keys are present, this operation creates or updates a chain
 of nested dictionaries. The updated dictionary value is returned.
-.VS TIP508
-If \fIdictionaryVarable\fR indicates an element that does not exist of an
-array that has a default value set, the default value and will be used as the
-value of the dictionary prior to the value insert/update operation.
-.VE TIP508
 .TP
 \fBdict size \fIdictionaryValue\fR
 .
@@ -241,11 +221,6 @@ through nested dictionaries to the mapping to remove. At least one key
 must be specified, but the last key on the key-path need not exist.
 All other components on the path must exist. The updated dictionary
 value is returned.
-.VS TIP508
-If \fIdictionaryVarable\fR indicates an element that does not exist of an
-array that has a default value set, the default value and will be used as the
-value of the dictionary prior to the value remove operation.
-.VE TIP508
 .TP
 \fBdict update \fIdictionaryVariable key varName \fR?\fIkey varName ...\fR? \fIbody\fR
 .
@@ -261,11 +236,6 @@ are silently discarded), even if the result of \fIbody\fR is an error
 or some other kind of exceptional exit. The result of \fBdict
 update\fR is (unless some kind of error occurs) the result of the
 evaluation of \fIbody\fR.
-.VS TIP508
-If \fIdictionaryVarable\fR indicates an element that does not exist of an
-array that has a default value set, the default value and will be used as the
-value of the dictionary prior to the update operation.
-.VE TIP508
 .RS
 .PP
 Each \fIvarName\fR is mapped in the scope enclosing the \fBdict update\fR;
@@ -300,11 +270,6 @@ dictionary be discarded, and this also happens if the contents of
 dictionaries no longer exists. The result of \fBdict with\fR is
 (unless some kind of error occurs) the result of the evaluation of
 \fIbody\fR.
-.VS TIP508
-If \fIdictionaryVarable\fR indicates an element that does not exist of an
-array that has a default value set, the default value and will be used as the
-value of the dictionary prior to the updating operation.
-.VE TIP508
 .RS
 .PP
 The variables are mapped in the scope enclosing the \fBdict with\fR;
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
+'\" 
 .TH eof n 7.5 Tcl "Tcl Built-In Commands"
 .so man.macros
 .BS
@@ -59,7 +59,3 @@ while {1} {
 file(n), open(n), close(n), fblocked(n), Tcl_StandardChannels(3)
 .SH KEYWORDS
 channel, end of file
-'\" Local Variables:
-'\" mode: nroff
-'\" fill-column: 78
-'\" End:
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
+'\" 
 .TH eval n "" Tcl "Tcl Built-In Commands"
 .so man.macros
 .BS
@@ -224,10 +224,10 @@ Although it is the common escape algorithm, but, in fact, the way how the
 executable parses the command-line (resp. splits it into single arguments)
 is decisive.
 .PP
-Unfortunately, there is currently no way to supply newline character within
-an argument to the batch files (\fB.cmd\fR or \fB.bat\fR) or to the command
+Unfortunately, there is currently no way to supply newline character within 
+an argument to the batch files (\fB.cmd\fR or \fB.bat\fR) or to the command 
 processor (\fBcmd.exe /c\fR), because this causes truncation of command-line
-(also the argument chain) on the first newline character.
+(also the argument chain) on the first newline character. 
 But it works properly with an executable (using CommandLineToArgv, etc).
 .PP
 The Tk console text widget does not provide real standard IO capabilities.
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
jan.nijtmans	8729900f69	Backport latest improvements from androwish	2018-09-03 09:47:40 +00:00
jan.nijtmans	93fe453205	merge 8.6	2018-09-03 07:51:24 +00:00
jan.nijtmans	215b5dd08d	merge 8.6	2018-05-31 20:31:42 +00:00
jan.nijtmans	1d768f7890	merge core-8-6-branch	2018-01-20 16:34:17 +00:00
jan.nijtmans	80206cc113	merge core-8-6-branch	2017-12-28 16:54:46 +00:00
jan.nijtmans	f851263f52	upstream androwish changes	2017-11-17 12:40:34 +00:00
jan.nijtmans	3ddad4402a	merge core-8-6-branch	2017-11-17 12:33:14 +00:00
jan.nijtmans	42259830ab	merge core-8-6-branch	2017-11-03 12:59:49 +00:00
jan.nijtmans	8f2cdcfe32	merge core-8-6-branch	2017-10-27 14:56:33 +00:00
jan.nijtmans	3e94587dff	merge core-8-6-branch	2017-10-10 15:05:14 +00:00
jan.nijtmans	8270c03fac	Merge core-8-6-branch, fallback for MAP_FILE	2017-09-04 13:21:51 +00:00
jan.nijtmans	0420e8dd91	merge core-8-6-branch	2017-09-01 14:00:17 +00:00
jan.nijtmans	c433e9b60a	merge rfe-6c0d7aec67 Adapt upstream Androwish improvements	2017-07-14 15:03:29 +00:00
jan.nijtmans	a64be34c0b	merge rfe-6c0d7aec67	2017-07-03 12:34:23 +00:00
jan.nijtmans	310ee501e8	Merge rfe-6c0d7aec67	2017-06-16 14:33:10 +00:00
jan.nijtmans	0104227d89	Merge rfe-6c0d7aec67	2017-06-13 12:20:39 +00:00
jan.nijtmans	43778c199d	Merge rfe-6c0d7aec67	2017-06-08 08:27:55 +00:00
jan.nijtmans	d7023c5bf4	merge core-8-6-branch	2017-06-02 14:27:29 +00:00
jan.nijtmans	d1f1107ccd	merge trunk	2017-05-23 12:24:10 +00:00
jan.nijtmans	202ffed8ed	merge core-8-6-branch	2017-05-18 12:58:37 +00:00
jan.nijtmans	4e74fe9243	merge core-8-6-branch	2017-05-08 08:11:07 +00:00
jan.nijtmans	fe6c8e39c5	merge core-8-6-branch	2017-05-03 13:37:04 +00:00
jan.nijtmans	39394a7c8c	merge core-8-6-branch	2017-04-25 11:12:48 +00:00
jan.nijtmans	db323b6992	merge core-8-6-branch	2017-04-18 19:06:10 +00:00
jan.nijtmans	f803ae2b11	merge core-8-6-branch	2017-04-18 18:56:48 +00:00
jan.nijtmans	174f55c044	Fix executable flag	2017-04-12 12:30:43 +00:00
jan.nijtmans	a270140a3e	merge core-8-6-branch	2017-04-12 12:29:49 +00:00
jan.nijtmans	841c04fbac	merge core-8-6-branch	2017-04-03 13:21:03 +00:00
jan.nijtmans	232349c3de	merge core-8-6-branch	2017-03-31 11:21:19 +00:00
jan.nijtmans	fb2b7d4615	merge core-8-6-branch	2017-03-24 10:33:14 +00:00