merge trunk

150 files changed, 7188 insertions, 2429 deletions

diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml
index 1ec784a..a9345a1 100644
--- a/.github/workflows/mac-build.yml
+++ b/.github/workflows/mac-build.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Build
         run: make all
         env:
-          CFLAGS: -arch x86_64 -arch arm64e
+          CFLAGS: -arch x86_64 -arch arm64
       - name: Run Tests
         run: make test styles=develop
         env:
@@ -51,13 +51,13 @@ jobs:
         # Note that macOS is always a 64 bit platform
         run: ./configure --enable-dtrace --enable-framework ${CFGOPT} "--prefix=$HOME/install" || (cat config.log && exit 1)
         env:
-          CFLAGS: -arch x86_64 -arch arm64e
+          CFLAGS: -arch x86_64 -arch arm64
           CFGOPT: ${{ matrix.cfgopt }}
       - name: Build
         run: |
           make all tcltest
         env:
-          CFLAGS: -arch x86_64 -arch arm64e
+          CFLAGS: -arch x86_64 -arch arm64
       - name: Run Tests
         run: |
           make test
diff --git a/.github/workflows/onefiledist.yml b/.github/workflows/onefiledist.yml
index 45ce720..1f75762 100644
--- a/.github/workflows/onefiledist.yml
+++ b/.github/workflows/onefiledist.yml
@@ -62,7 +62,7 @@ jobs:
           sudo chmod a+x /usr/local/bin/macher
           echo "VER_PATH=$(cd tools; pwd)/addVerToFile.tcl" >> $GITHUB_ENV
           echo "CREATE_DMG=$(cd create-dmg;pwd)/create-dmg" >> $GITHUB_ENV
-          echo "CFLAGS=-arch x86_64 -arch arm64e" >> $GITHUB_ENV
+          echo "CFLAGS=-arch x86_64 -arch arm64" >> $GITHUB_ENV
       - name: Configure
         run: ./configure --disable-symbols --disable-shared --enable-zipfs
         working-directory: unix
diff --git a/ChangeLog.2003 b/ChangeLog.2003
index 3c3ee11..ec4109f 100644
--- a/ChangeLog.2003
+++ b/ChangeLog.2003
@@ -2331,7 +2331,7 @@
 	argument, the Tcl_Interp struct loses its termOffset field and the
 	TCL_BRACKET_TERM flag in the evalFlags field, all of which were only
 	used (indirectly) by Tcl_SubstObj(). Tests subst-8.7,8.8,11.4,11.5
-	modified to accomodate the only behavior change: reporting of parse
+	modified to accommodate the only behavior change: reporting of parse
 	errors now takes precedence over [return] and [continue] exceptions.
 	All other behavior should remain compatible. [RFE 536831,684982] [Bug
 	685106]
@@ -2571,7 +2571,7 @@
 2003-02-25  Don Porter	<dgp@users.sourceforge.net>
 
 	* doc/pkgMkIndex.n:	Modified [pkg_mkIndex] to use -nocase matching
-	* library/package.tcl:	of -load patterns, to better accomodate common
+	* library/package.tcl:	of -load patterns, to better accommodate common
 	user errors due to confusion between [package names] names and [info
 	loaded] names.
 
diff --git a/changes b/changes
index 6fbf518..430686c 100644
--- a/changes
+++ b/changes
@@ -2486,7 +2486,7 @@ interpreter. (JL)
 installing and requesting security policies, purely in Tcl code. Overloads
 the package command to also allow an interpreter to "require" a policy. The
 following new library commands are provided:
-	tcl_safeCreateInterp	-- creates a slave an initializes the
+	tcl_safeCreateInterp	-- creates a slave and initializes the
 				   policy mechanism.
 	tcl_safeInitInterp	-- initializes an existing slave with the
 				   policy mechanism.
diff --git a/compat/zlib/contrib/minizip/minizip.c b/compat/zlib/contrib/minizip/minizip.c
index e03e2b1..0f0112b 100644
--- a/compat/zlib/contrib/minizip/minizip.c
+++ b/compat/zlib/contrib/minizip/minizip.c
@@ -66,6 +66,9 @@
 #ifdef _WIN32
         #define USEWIN32IOAPI
         #include "iowin32.h"
+#       if defined(_MSC_VER)
+#           define snprintf _snprintf
+#       endif
 #endif
 
 
@@ -365,7 +368,7 @@ void addFileToZip(zipFile zf, const char *filenameinzip, const char *password, i
 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];
+    char newname[MAXFILENAME+1+MAXFILENAME+1];
 
     tinydir_open_sorted(&dir, filenameinzip);
 
@@ -375,7 +378,7 @@ void addPathToZip(zipFile zf, const char *filenameinzip, const char *password, i
         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);
+        snprintf(newname, sizeof(newname), "%.*s/%.*s", MAXFILENAME, dir.path, MAXFILENAME, file.name);
         if (file.is_dir)
         {
             addPathToZip(zf,newname,password,opt_exclude_path,opt_compress_level);
diff --git a/doc/Encoding.3 b/doc/Encoding.3
index 7b5e9d4..942d4c1 100644
--- a/doc/Encoding.3
+++ b/doc/Encoding.3
@@ -8,7 +8,7 @@
 .so man.macros
 .BS
 .SH NAME
-Tcl_GetEncoding, Tcl_FreeEncoding, Tcl_GetEncodingFromObj, Tcl_ExternalToUtfDString, Tcl_ExternalToUtf, Tcl_UtfToExternalDString, Tcl_UtfToExternal, Tcl_GetEncodingName, Tcl_SetSystemEncoding, Tcl_GetEncodingNameFromEnvironment, Tcl_GetEncodingNames, Tcl_CreateEncoding, Tcl_GetEncodingSearchPath, Tcl_SetEncodingSearchPath \- procedures for creating and using encodings
+Tcl_GetEncoding, Tcl_FreeEncoding, Tcl_GetEncodingFromObj, Tcl_ExternalToUtfDString, Tcl_ExternalToUtfDStringEx, Tcl_ExternalToUtf, Tcl_UtfToExternalDString, Tcl_UtfToExternalDStringEx, Tcl_UtfToExternal, Tcl_GetEncodingName, Tcl_SetSystemEncoding, Tcl_GetEncodingNameFromEnvironment, Tcl_GetEncodingNames, Tcl_CreateEncoding, Tcl_GetEncodingSearchPath, Tcl_SetEncodingSearchPath \- procedures for creating and using encodings
 .SH SYNOPSIS
 .nf
 \fB#include <tcl.h>\fR
@@ -26,13 +26,13 @@ char *
 \fBTcl_ExternalToUtfDString\fR(\fIencoding, src, srcLen, dstPtr\fR)
 .sp
 size_t
-\fBTcl_ExternalToUtfDStringEx\fR(\fIencoding, src, srcLen, flags, dstPtr\fR)
+\fBTcl_ExternalToUtfDStringEx\fR(\fIinterp, encoding, src, srcLen, flags, dstPtr, errorIdxPtr\fR)
 .sp
 char *
 \fBTcl_UtfToExternalDString\fR(\fIencoding, src, srcLen, dstPtr\fR)
 .sp
 size_t
-\fBTcl_UtfToExternalDStringEx\fR(\fIencoding, src, srcLen, flags, dstPtr\fR)
+\fBTcl_UtfToExternalDStringEx\fR(\fIinterp, encoding, src, srcLen, flags, dstPtr, errorIdxPtr\fR)
 .sp
 int
 \fBTcl_ExternalToUtf\fR(\fIinterp, encoding, src, srcLen, flags, statePtr,
@@ -93,7 +93,7 @@ encoding-specific length of the string is used.
 Pointer to an uninitialized or free \fBTcl_DString\fR in which the converted
 result will be stored.
 .AP int flags in
-Various flag bits OR-ed together.
+This is a bit mask passed in to control the operation of the encoding functions.
 \fBTCL_ENCODING_START\fR signifies that the
 source buffer is the first block in a (potentially multi-block) input
 stream, telling the conversion routine to reset to an initial state and
@@ -101,16 +101,15 @@ perform any initialization that needs to occur before the first byte is
 converted. \fBTCL_ENCODING_END\fR signifies that the source buffer is the last
 block in a (potentially multi-block) input stream, telling the conversion
 routine to perform any finalization that needs to occur after the last
-byte is converted and then to reset to an initial state.
-\fBTCL_ENCODING_NOCOMPLAIN\fR signifies that the conversion routine should
-not return immediately upon reading a source character that does not exist in
-the target encoding, but it will substitute a default fallback character for
-all of such characters. The flag \fBTCL_ENCODING_STOPONERROR\fR has no effect,
-it only has meaning in Tcl 8.x. The flag \fBTCL_ENCODING_STRICT\fR makes the
-encoder/decoder more strict in what it considers to be an invalid byte
-sequence. The flag \fBTCL_ENCODING_MODIFIED\fR makes
-\fBTcl_UtfToExternalDStringEx\fR and \fBTcl_UtfToExternal\fR produce the byte
-sequence \exC0\ex80 in stead of \ex00, for the utf-8/cesu-8 encoders.
+byte is converted and then to reset to an initial state. The
+\fBTCL_PROFILE_*\fR bits defined in the \fBPROFILES\fR section below
+control the encoding profile to be used for dealing with invalid data or
+other errors in the encoding transform.
+\fBTCL_ENCODING_STOPONERROR\fR is present for backward compatibility with
+Tcl 8.6 and forces the encoding profile to \fBstrict\fR.
+
+Some flags bits may not be usable with some functions as noted in the
+function descriptions below.
 .AP Tcl_EncodingState *statePtr in/out
 Used when converting a (generally long or indefinite length) byte stream
 in a piece-by-piece fashion.  The conversion routine stores its current
@@ -136,6 +135,9 @@ buffer as a result of the conversion.  May be NULL.
 .AP int *dstCharsPtr out
 Filled with the number of characters that correspond to the number of bytes
 stored in the output buffer.  May be NULL.
+.AP Tcl_Size *errorIdxPtr out
+Filled with the index of the byte or character that caused the encoding transform
+to fail. May be NULL.
 .AP Tcl_DString *bufPtr out
 Storage for the prescribed system encoding name.
 .AP "const Tcl_EncodingType" *typePtr in
@@ -210,10 +212,27 @@ When converting, if any of the characters in the source buffer cannot be
 represented in the target encoding, a default fallback character will be
 used.  The return value is a pointer to the value stored in the DString.
 .PP
-\fBTcl_ExternalToUtfDStringEx\fR is the same as \fBTcl_ExternalToUtfDString\fR,
-but it has an additional flags parameter.  The return value is the index of
-the first byte in the input string causing a conversion error.
-Or TCL_INDEX_NONE if all is OK.
+\fBTcl_ExternalToUtfDStringEx\fR is a more flexible version of older
+\fBTcl_ExternalToUtfDString\fR function. It takes three additional parameters,
+\fBinterp\fR, \fBflags\fR and \fBerrorIdxPtr\fR. The \fBflags\fR parameter may
+be used to specify the profile to be used for the transform. The
+\fBTCL_ENCODING_START\fR and \fBTCL_ENCODING_END\fR bits in \fBflags\fR are
+ignored as the function assumes the entire source string to be decoded is passed
+into the function. On success, the function returns \fBTCL_ERROR\fR with the
+converted string stored in \fB*dstPtr\fR. For errors other than conversion
+errors, such as invalid flags, the function returns \fBTCL_OK\fR with an error
+message in \fBinterp\fR if it is not NULL.
+.PP
+For conversion errors, \fBTcl_ExternalToUtfDStringEx\fR returns one
+of the \fBTCL_CONVERT_*\fR errors listed below for \fBTcl_ExternalToUtf\fR.
+When one of these conversion errors is returned, an error message is
+stored in \fBinterp\fR only if \fBerrorIdxPtr\fR is NULL. Otherwise, no error message
+is stored as the function expects the caller is interested whatever is
+decoded to that point and not treating this as an immediate error condition.
+The index of the error location is stored in \fB*errorIdxPtr\fR.
+.PP
+The caller must call \fBTcl_DStringFree\fR to free up the \fB*dstPtr\fR resources
+irrespective of the return value from the function.
 .PP
 \fBTcl_ExternalToUtf\fR converts a source buffer \fIsrc\fR from the specified
 \fIencoding\fR into UTF-8.  Up to \fIsrcLen\fR bytes are converted from the
@@ -236,12 +255,12 @@ the unconverted bytes that remained in \fIsrc\fR plus some further bytes
 from the source stream to properly convert the formerly split-up multibyte
 sequence.
 .IP \fBTCL_CONVERT_SYNTAX\fR 29
-The source buffer contained an invalid character sequence.  This may occur
+The source buffer contained an invalid byte or character sequence.  This may occur
 if the input stream has been damaged or if the input encoding method was
 misidentified.
 .IP \fBTCL_CONVERT_UNKNOWN\fR 29
 The source buffer contained a character that could not be represented in
-the target encoding and \fBTCL_ENCODING_NOCOMPLAIN\fR was not specified.
+the target encoding.
 .RE
 .LP
 \fBTcl_UtfToExternalDString\fR converts a source buffer \fIsrc\fR from UTF-8
@@ -253,10 +272,14 @@ characters in the source buffer cannot be represented in the target
 encoding, a default fallback character will be used.  The return value is
 a pointer to the value stored in the DString.
 .PP
-\fBTcl_UtfToExternalDStringEx\fR is the same as \fBTcl_UtfToExternalDString\fR,
-but it has an additional flags parameter.  The return value is the index of
-the first byte of an utf-8 byte-sequence in the input string causing a
-conversion error. Or TCL_INDEX_NONE if all is OK.
+\fBTcl_UtfToExternalDStringEx\fR is an enhanced version of
+\fBTcl_UtfToExternalDString\fR that transforms UTF-8 encoded source data to a specified
+\fIencoding\fR. Except for the direction of the transform, the parameters and
+return values are identical to those of \fBTcl_ExternalToUtfDStringEx\fR. See
+that function above for details about the same.
+
+Irrespective of the return code from the function, the caller must free
+resources associated with \fB*dstPtr\fR when the function returns.
 .PP
 \fBTcl_UtfToExternal\fR converts a source buffer \fIsrc\fR from UTF-8 into
 the specified \fIencoding\fR.  Up to \fIsrcLen\fR bytes are converted from
@@ -559,6 +582,18 @@ to the object, it will be deleted.
 .PP
 \fBTcl_GetEncodingSearchPath\fR returns an object with a reference count of at
 least 1.
+.SH "PROFILES"
+Encoding profiles define the manner in which errors in the encoding transforms
+are handled by the encoding functions. An application can specify the profile
+to be used by OR-ing the \fBflags\fR parameter passed to the function
+with at most one of \fBTCL_ENCODING_PROFILE_TCL8\fR,
+\fBTCL_ENCODING_PROFILE_STRICT\fR or \fBTCL_ENCODING_PROFILE_REPLACE\fR.
+These correspond to the \fBtcl8\fR, \fBstrict\fR and \fBreplace\fR profiles
+respectively. If none are specified, a version-dependent default profile is used.
+For Tcl 8.7, the default profile is \fBtcl8\fR.
+.PP
+For details about profiles, see the \fBPROFILES\fR section in
+the documentation of the \fBencoding\fR command.
 .SH "SEE ALSO"
 encoding(n)
 .SH KEYWORDS
diff --git a/doc/SetVar.3 b/doc/SetVar.3
index eb8333b..9d8e0b7 100644
--- a/doc/SetVar.3
+++ b/doc/SetVar.3
@@ -250,18 +250,18 @@ and \fBTcl_ObjGetVar2\fR is (if non-NULL) a value with a reference of at least
 operated upon.
 .PP
 The \fInewValuePtr\fR argument to \fBTcl_SetVar2Ex\fR and \fBTcl_ObjSetVar2\fR
-may be an arbitrary reference count value; its reference count will be
-incremented on success. However, it is recommended to not use a zero reference
-count value, as that makes correct handling of the error case tricky.
+may be an arbitrary reference count value.  Its reference count is
+incremented on success.  On failure, if its reference count is zero, it is
+decremented and freed so the caller need do nothing with it.
 .PP
-The \fIpart1\fR argument to \fBTcl_ObjSetVar2\fR and \fBTcl_ObjGetVar2\fR can
-have any reference count; these functions never modify it. It is recommended
-to not use a zero reference count for this argument.
+The \fIpart1Ptr\fR argument to \fBTcl_ObjSetVar2\fR and \fBTcl_ObjGetVar2\fR can
+have any reference count.  These functions never modify it.
 .PP
-The \fIpart2\fR argument to \fBTcl_ObjSetVar2\fR and \fBTcl_ObjGetVar2\fR, if
+The \fIpart2Ptr\fR argument to \fBTcl_ObjSetVar2\fR and \fBTcl_ObjGetVar2\fR, if
 non-NULL, should not have a zero reference count as these functions may
-retain a reference to it (particularly when it is used to create an array
-element that did not previously exist).
+retain a reference to it, particularly when it is used to create an array
+element that did not previously exist, and decrementing the reference count
+later would leave them pointing to a freed Tcl_Obj.
 
 .SH "SEE ALSO"
 Tcl_GetObjResult, Tcl_GetStringResult, Tcl_TraceVar
diff --git a/doc/chan.n b/doc/chan.n
index 584f0c5..e8601f6 100644
--- a/doc/chan.n
+++ b/doc/chan.n
@@ -150,6 +150,16 @@ the end of the data.
 
 The default value is the empty string.  The acceptable range is \ex01 -
 \ex7f.  A value outside this range results in an error.
+.VS "TCL8.7 TIP656"
+.TP
+\fB\-profile\fR \fIprofile\fR
+.
+Specifies the encoding profile to be used on the channel. The encoding
+transforms in use for the channel's input and output will then be subject to the
+rules of that profile. Any failures will result in a channel error. See
+\fBPROFILES\fR in the \fBencoding(n)\fR documentation for details about encoding
+profiles.
+.VE "TCL8.7 TIP656"
 .TP
 \fB\-translation\fR \fItranslation\fR
 .TP
diff --git a/doc/encoding.n b/doc/encoding.n
index 214ce19..c881d26 100644
--- a/doc/encoding.n
+++ b/doc/encoding.n
@@ -8,163 +8,196 @@
 .so man.macros
 .BS
 .SH NAME
-encoding \- Manipulate encodings
+encoding \- Work with encodings
 .SH SYNOPSIS
-\fBencoding \fIoption\fR ?\fIarg arg ...\fR?
+\fBencoding \fIoperation\fR ?\fIarg arg ...\fR?
 .BE
 .SH INTRODUCTION
 .PP
-Strings in Tcl are logically a sequence of Unicode characters.
-These strings are represented in memory as a sequence of bytes that
-may be in one of several encodings: modified UTF\-8 (which uses 1 to 4
-bytes per character), or a custom encoding start as 8 bit binary data.
-.PP
-Different operating system interfaces or applications may generate
-strings in other encodings such as Shift\-JIS.  The \fBencoding\fR
-command helps to bridge the gap between Unicode and these other
-formats.
+In Tcl every string is composed of Unicode values.  Text may be encoded into an
+encoding such as cp1252, iso8859-1, Shitf\-JIS, utf-8, utf-16, etc. Not every
+Unicode vealue is encodable in every encoding, and some encodings can encode
+values that are not available in Unicode.
+.PP
+Even though Unicode is for encoding the written texts of human languages, any
+sequence of bytes can be encoded as the first 255 Unicode values.  iso8859-1 an
+encoding for a subset of Unicode in which each byte is a Unicode value of 255
+or less.  Thus, any sequence of bytes can be considered to be a Unicode string
+encoded in iso8859-1.  To work with binary data in Tcl, decode it from
+iso8859-1 when reading it in, and encode it into iso8859-1 when writing it out,
+ensuring that each character in the string has a value of 255 or less.
+Decoding such a string does nothing, and encoding encoding such a string also
+does nothing.
+.PP
+For example, the following is true:
+.CS
+set text {In Tcl binary data is treated as Unicode text and it just works.}
+set encoded [encoding convertto iso8859-1 $text]
+expr {$text eq $encoded}; #-> 1
+.CE
+The following is also true:
+.CS
+set decoded [encoding convertfrom iso8859-1 $text]
+expr {$text eq $decoded}; #-> 1
+.CE
 .SH DESCRIPTION
 .PP
-Performs one of several encoding related operations, depending on
-\fIoption\fR.  The legal \fIoption\fRs are:
+Performs one of the following encoding \fIoperations\fR:
+.TP
+\fBencoding convertfrom\fR ?\fIencoding\fR? \fIdata\fR
 .TP
-\fBencoding convertfrom\fR ?\fB-strict\fR? ?\fB-failindex var\fR? ?\fIencoding\fR? \fIdata\fR
-\fBencoding convertfrom\fR \fB-nocomplain\fR ?\fIencoding\fR? \fIdata\fR
+\fBencoding convertfrom\fR ?\fB-profile \fIprofile\fR? ?\fB-failindex var\fR? \fIencoding\fR \fIdata\fR
 .
-Convert \fIdata\fR to a Unicode string from the specified \fIencoding\fR.  The
-characters in \fIdata\fR are 8 bit binary data.  The resulting
-sequence of bytes is a string created by applying the given \fIencoding\fR
-to the data. If \fIencoding\fR is not specified, the current
-system encoding is used.
-.VS "TCL8.7 TIP346, TIP607, TIP601"
-.PP
-.RS
-If the option \fB-nocomplain\fR is given, the command does not fail on
-encoding errors.  Instead, any not convertable bytes (like incomplete UTF-8
- sequences, see example below) are put as byte values into the output stream.
-If the option \fB-nocomplain\fR is not given, the command will fail with an
-appropriate error message.
-.PP
-If the option \fB-failindex\fR with a variable name is given, the error reporting
-is changed in the following manner:
-in case of a conversion error, the position of the input byte causing the error
-is returned in the given variable.  The return value of the command are the
-converted characters until the first error position. No error condition is raised.
-In case of no error, the value \fI-1\fR is written to the variable.  This option
-may not be used together with \fB-nocomplain\fR.
-.PP
-The \fB-strict\fR option follows more strict rules in conversion.  For the \fButf-8\fR
-encoder, it disallows invalid byte sequences and surrogates (which -
-otherwise - are just passed through).  This option may not be used together
-with \fB-nocomplain\fR.
-.VE "TCL8.7 TIP346, TIP607, TIP601"
-.RE
+Decodes \fIdata\fR encoded in \fIencoding\fR. If \fIencoding\fR is not
+specified the current system encoding is used.
+
+.VS "TCL8.7 TIP607, TIP656"
+\fB-profile\fR determines how invalid data for the encoding are handled.  See
+the \fBPROFILES\fR section below for details.  Returns an error if decoding
+fails.  However, if \fB-failindex\fR given, returns the result of the
+conversion up to the point of termination, and stores in \fBvar\fR the index of
+the character that could not be converted. If no errors are encountered the
+entire result of the conversion is returned and the value \fB-1\fR is stored in
+\fBvar\fR.
+.VE "TCL8.7 TIP607, TIP656"
+.TP
+\fBencoding convertto\fR ?\fIencoding\fR? \fIdata\fR
 .TP
-\fBencoding convertto\fR ?\fB-strict\fR? ?\fB-failindex var\fR? ?\fIencoding\fR? \fIdata\fR
-\fBencoding convertto\fR \fB-nocomplain\fR ?\fIencoding\fR? \fIdata\fR
+\fBencoding convertto\fR ?\fB-profile \fIprofile\fR? ?\fB-failindex var\fR? \fIencoding\fR \fIdata\fR
 .
-Convert \fIstring\fR from Unicode to the specified \fIencoding\fR.
-The result is a sequence of bytes that represents the converted
-string.  Each byte is stored in the lower 8-bits of a Unicode
-character (indeed, the resulting string is a binary string as far as
-Tcl is concerned, at least initially).  If \fIencoding\fR is not
-specified, the current system encoding is used.
-.VS "TCL8.7 TIP346, TIP607, TIP601"
-.PP
-.RS
-If the option \fB-nocomplain\fR is given, the command does not fail on
-encoding errors.  Instead, the replacement character \fB?\fR is output
-for any not representable character (like the dot \fB\\U2022\fR
-in \fBiso-8859-1\fR encoding, see example below).
-If the option \fB-nocomplain\fR is not given, the command will fail with an
-appropriate error message.
-.PP
-If the option \fB-failindex\fR with a variable name is given, the error reporting
-is changed in the following manner:
-in case of a conversion error, the position of the input character causing the error
-is returned in the given variable.  The return value of the command are the
-converted bytes until the first error position. No error condition is raised.
-In case of no error, the value \fI-1\fR is written to the variable.  This option
-may not be used together with \fB-nocomplain\fR.
-.PP
-The \fB-strict\fR option follows more strict rules in conversion.  For the \fButf-8\fR
-encoder, it has no effect.  This option may not be used together with \fB-nocomplain\fR.
-.VE "TCL8.7 TIP346, TIP607, TIP601"
-.RE
+Converts \fIstring\fR to \fIencoding\fR.  If \fIencoding\fR is not given, the
+current system encoding is used.
+
+.VS "TCL8.7 TIP607, TIP656"
+See \fBencoding convertfrom\fR for the meaning of \fB-profile\fR and \fB-failindex\fR.
+.VE "TCL8.7 TIP607, TIP656"
 .TP
 \fBencoding dirs\fR ?\fIdirectoryList\fR?
 .
-Tcl can load encoding data files from the file system that describe
-additional encodings for it to work with. This command sets the search
-path for \fB*.enc\fR encoding data files to the list of directories
-\fIdirectoryList\fR. If \fIdirectoryList\fR is omitted then the
-command returns the current list of directories that make up the
-search path. It is an error for \fIdirectoryList\fR to not be a valid
-list. If, when a search for an encoding data file is happening, an
-element in \fIdirectoryList\fR does not refer to a readable,
-searchable directory, that element is ignored.
+Sets the search path for \fB*.enc\fR encoding data files to the list of
+directories given by \fIdirectoryList\fR.  If \fIdirectoryList\fR is not given,
+returns the current list of directories that make up the search path.  It is
+not an error for an item in \fIdirectoryList\fR to not refer to a readable,
+searchable directory.
 .TP
 \fBencoding names\fR
 .
-Returns a list containing the names of all of the encodings that are
-currently available.
+Returns a list of the names of available encodings.
 The encodings
 .QW utf-8
 and
 .QW iso8859-1
 are guaranteed to be present in the list.
+.VS "TCL8.7 TIP656"
+.TP
+\fBencoding profiles\fR
+Returns a list of names of available encoding profiles. See \fBPROFILES\fR
+below.
+.VE "TCL8.7 TIP656"
 .TP
 \fBencoding system\fR ?\fIencoding\fR?
 .
-Set the system encoding to \fIencoding\fR. If \fIencoding\fR is
-omitted then the command returns the current system encoding.  The
-system encoding is used whenever Tcl passes strings to system calls.
-.SH EXAMPLE
+Sets the system encoding to \fIencoding\fR. If \fIencoding\fR is not given,
+returns the current system encoding.  The system encoding is used to pass
+strings to system calls.
+.\" Do not put .VS on whole section as that messes up the bullet list alignment
+.SH PROFILES
+.PP
+.VS "TCL8.7 TIP656"
+Each \fIprofile\fR is a distinct strategy for dealing with invalid data for an
+encoding.
+.PP
+The following profiles are currently implemented.
+.VS "TCL8.7 TIP656"
+.TP
+\fBtcl8\fR
+.
+The default profile.  Provides for behaviour identical to that of Tcl 8.6: When
+decoding, for encodings \fBother than utf-8\fR, each invalid byte is interpreted
+as the Unicode value given by that one byte. For example, the byte 0x80, which
+is invalid in the ASCII encoding would be mapped to the Unicode value U+0080.
+For \fButf-8\fR, each invalid byte that is a valid CP1252 character is
+interpreted as the Unicode value for that character, while each byte that is
+not is treated as the Unicode value given by that one byte. For example, byte
+0x80 is defined by CP1252 and is therefore mapped to its Unicode equivalent
+U+20AC while byte 0x81 which is not defined by CP1252 is mapped to U+0081. As
+an additional special case, the sequence 0xC0 0x80 is mapped to U+0000.
+
+When encoding, each character that cannot be represented in the encoding is
+replaced by an encoding-dependent character, usually the question mark \fB?\fR.
+.TP
+\fBstrict\fR
+.
+The operation fails when invalid data for the encoding are encountered.
+.TP
+\fBreplace\fR
+.
+When decoding, invalid bytes are replaced by U+FFFD, the Unicode REPLACEMENT
+CHARACTER.
+
+When encoding, Unicode values that cannot be represented in the target encoding
+are transformed to an encoding-specific fallback character, U+FFFD REPLACEMENT
+CHARACTER for UTF targets, and generally `?` for other encodings.
+.VE "TCL8.7 TIP656"
+.SH EXAMPLES
+.PP
+These examples use the utility proc below that prints the Unicode value for
+each character in a string.
+.PP
+.CS
+proc codepoints s {join [lmap c [split $s {}] {
+    string cat U+ [format %.6X [scan $c %c]]}]
+}
+.CE
 .PP
-Example 1: convert a byte sequence in Japanese euc-jp encoding to a TCL string:
+Example 1: Convert from euc-jp:
 .PP
 .CS
-set s [\fBencoding convertfrom\fR euc-jp "\exA4\exCF"]
+% codepoints [\fBencoding convertfrom\fR euc-jp \exA4\exCF]
+U+00306F
 .CE
 .PP
-The result is the unicode codepoint:
+The result is the Unicode value
 .QW "\eu306F" ,
 which is the Hiragana letter HA.
-.VS "TCL8.7 TIP346, TIP607, TIP601"
+.VS "TCL8.7 TIP607, TIP656"
 .PP
-Example 2: detect the error location in an incomplete UTF-8 sequence:
+Example 2: Error handling based on profiles:
 .PP
-.CS
-% set s [\fBencoding convertfrom\fR -failindex i utf-8 "A\exC3"]
-A
-% set i
-1
-.CE
-.PP
-Example 3: return the incomplete UTF-8 sequence by raw bytes:
+The letter \fBA\fR is Unicode character U+0041 and the byte "\ex80" is invalid
+in ASCII encoding.
 .PP
 .CS
-% set s [\fBencoding convertfrom\fR -nocomplain utf-8 "A\exC3"]
+% codepoints [encoding convertfrom -profile tcl8 ascii A\ex80]
+U+000041 U+000080
+% codepoints [encoding convertfrom -profile replace ascii A\ex80]
+U+000041 U+00FFFD
+% codepoints [encoding convertfrom -profile strict ascii A\ex80]
+unexpected byte sequence starting at index 1: '\ex80'
 .CE
-The result is "A" followed by the byte \exC3.
 .PP
-Example 4: detect the error location while transforming to ISO8859-1
-(ISO-Latin 1):
+Example 3: Get partial data and the error location:
 .PP
 .CS
-% set s [\fBencoding convertto\fR -failindex i iso8859-1 "A\eu0141"]
-A
-% set i
-1
+% codepoints [encoding convertfrom -profile strict -failindex idx ascii AB\ex80]
+U+000041 U+000042
+% set idx
+2
 .CE
 .PP
-Example 5: replace a not representable character by the replacement character:
+Example 4: Encode a character that is not representable in ISO8859-1:
 .PP
 .CS
-% set s [\fBencoding convertto\fR -nocomplain iso8859-1 "A\eu0141"]
+% encoding convertto iso8859-1 A\eu0141
 A?
+% encoding convertto -profile strict iso8859-1 A\eu0141
+unexpected character at index 1: 'U+000141'
+% encoding convertto -profile strict -failindex idx iso8859-1 A\eu0141
+A
+% set idx
+1
 .CE
-.VE "TCL8.7 TIP346, TIP607, TIP601"
+.VE "TCL8.7 TIP607, TIP656"
 .PP
 .SH "SEE ALSO"
 Tcl_GetEncoding(3), fconfigure(n)
diff --git a/doc/fconfigure.n b/doc/fconfigure.n
index 912702f..c2847cd 100644
--- a/doc/fconfigure.n
+++ b/doc/fconfigure.n
@@ -112,33 +112,16 @@ string.
 The acceptable range for \fB\-eofchar\fR values is \ex01 - \ex7F;
 attempting to set \fB\-eofchar\fR to a value outside of this range will
 generate an error.
-.VS "TCL9.0 TIP633"
+.VS "TCL8.7 TIP656"
 .TP
-\fB\-nocomplainencoding\fR \fIbool\fR
+\fB\-profile\fR \fIprofile\fR
 .
-Reporting mode of encoding errors.
-If set to a \fItrue\fR value, encoding errors are resolved by a replacement
-character (output) or verbatim bytes (input). No error is thrown.
-If set to a \fIfalse\fR value, errors are thrown in case of encoding errors.
-.RS
-.PP
-The default value is \fIfalse\fR starting from TCL 9.0 and \fItrue\fR on TCL 8.7.
-This option was introduced with TCL 8.7 and has the fix value \fItrue\fR.
-.PP
-See the \fI\-nocomplain\fR option of the \fBencoding\fR command for more information.
-.RE
-.VE "TCL9.0 TIP633"
-.VS "TCL8.7 TIP346"
-.TP
-\fB\-strictencoding\fR \fIbool\fR
-.
-Activate additional stricter encoding application rules.
-Default value is \fIfalse\fR.
-.RS
-.PP
-See the \fI\-strict\fR option of the \fBencoding\fR command for more information.
-.VE "TCL8.7 TIP346"
-.RE
+Specifies the encoding profile to be used on the channel. The encoding
+transforms in use for the channel's input and output will then be subject to the
+rules of that profile. Any failures will result in a channel error. See
+\fBPROFILES\fR in the \fBencoding(n)\fR documentation for details about encoding
+profiles.
+.VE "TCL8.7 TIP656"
 .TP
 \fB\-translation\fR \fImode\fR
 .TP
@@ -299,7 +282,7 @@ close(n), encoding(n), flush(n), gets(n), open(n), puts(n), read(n), socket(n),
 Tcl_StandardChannels(3)
 .SH KEYWORDS
 blocking, buffering, carriage return, end of line, encoding, flushing, linemode,
-newline, nonblocking, platform, translation, encoding, filter, byte array,
+newline, nonblocking, platform, profile, translation, encoding, filter, byte array,
 binary
 '\" Local Variables:
 '\" mode: nroff
diff --git a/doc/refchan.n b/doc/refchan.n
index c17117d..ae900c5 100644
--- a/doc/refchan.n
+++ b/doc/refchan.n
@@ -53,8 +53,8 @@ here, then the \fBfinalize\fR subcommand will not be called.
 .PP
 The \fImode\fR argument tells the handler whether the channel was
 opened for reading, writing, or both. It is a list containing any of
-the strings \fBread\fR or \fBwrite\fR. The list will always
-contain at least one element.
+the strings \fBread\fR or \fBwrite\fR. The list may be empty, but
+will usually contain at least one element.
 .PP
 The subcommand must throw an error if the chosen mode is not
 supported by the \fIcmdPrefix\fR.
diff --git a/generic/regcomp.c b/generic/regcomp.c
index 9ecc8c6..012e37c 100644
--- a/generic/regcomp.c
+++ b/generic/regcomp.c
@@ -2184,9 +2184,9 @@ stid(
 	return "unable";
     }
     if (t->id != 0) {
-	sprintf(buf, "%d", t->id);
+	snprintf(buf, bufsize, "%d", t->id);
     } else {
-	sprintf(buf, "%p", t);
+	snprintf(buf, bufsize, "%p", t);
     }
     return buf;
 }
diff --git a/generic/regerror.c b/generic/regerror.c
index a53a0fd..5caab8a 100644
--- a/generic/regerror.c
+++ b/generic/regerror.c
@@ -73,7 +73,7 @@ regerror(
 		break;
 	    }
 	}
-	sprintf(convbuf, "%d", r->code); /* -1 for unknown */
+	snprintf(convbuf, sizeof(convbuf), "%d", r->code); /* -1 for unknown */
 	msg = convbuf;
 	break;
     case REG_ITOA:		/* Convert number to name */
@@ -86,7 +86,7 @@ regerror(
 	if (r->code >= 0) {
 	    msg = r->name;
 	} else {		/* Unknown; tell him the number */
-	    sprintf(convbuf, "REG_%u", icode);
+	    snprintf(convbuf, sizeof(convbuf), "REG_%u", icode);
 	    msg = convbuf;
 	}
 	break;
@@ -99,7 +99,7 @@ regerror(
 	if (r->code >= 0) {
 	    msg = r->explain;
 	} else {		/* Unknown; say so */
-	    sprintf(convbuf, unk, code);
+	    snprintf(convbuf, sizeof(convbuf), unk, code);
 	    msg = convbuf;
 	}
 	break;
diff --git a/generic/tcl.decls b/generic/tcl.decls
index 3778de6..e50e3de 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -2500,13 +2500,17 @@ declare 656 {
 declare 657 {
     int Tcl_UniCharIsUnicode(int ch)
 }
+
+# TIP 656
 declare 658 {
-    Tcl_Size Tcl_ExternalToUtfDStringEx(Tcl_Encoding encoding,
-	    const char *src, Tcl_Size srcLen, int flags, Tcl_DString *dsPtr)
+    int Tcl_ExternalToUtfDStringEx(Tcl_Interp *interp, Tcl_Encoding encoding,
+        const char *src, Tcl_Size srcLen, int flags, Tcl_DString *dsPtr,
+        Tcl_Size *errorLocationPtr)
 }
 declare 659 {
-    Tcl_Size Tcl_UtfToExternalDStringEx(Tcl_Encoding encoding,
-	    const char *src, Tcl_Size srcLen, int flags, Tcl_DString *dsPtr)
+    int Tcl_UtfToExternalDStringEx(Tcl_Interp *interp, Tcl_Encoding encoding,
+    const char *src, Tcl_Size srcLen, int flags, Tcl_DString *dsPtr,
+    Tcl_Size *errorLocationPtr)
 }
 
 # TIP #511
@@ -2645,7 +2649,7 @@ interface tclPlat
 declare 1 {
     int Tcl_MacOSXOpenVersionedBundleResources(Tcl_Interp *interp,
 	    const char *bundleName, const char *bundleVersion,
-	    int hasResourceFile, size_t maxPathLen, char *libraryPath)
+	    int hasResourceFile, Tcl_Size maxPathLen, char *libraryPath)
 }
 declare 2 {
     void Tcl_MacOSXNotifierAddRunLoopMode(const void *runLoopMode)
diff --git a/generic/tcl.h b/generic/tcl.h
index b00de5d..2bcd632 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -1944,33 +1944,35 @@ typedef struct Tcl_EncodingType {
  *				content.  Otherwise, the number of chars
  *				produced is controlled only by other limiting
  *				factors.
- * TCL_ENCODING_MODIFIED -	Convert NULL bytes to \xC0\x80 in stead of
- *				0x00. Only valid for "utf-8" and "cesu-8".
- *				This flag is implicit for external -> internal conversions,
- *				optional for internal -> external conversions.
- * TCL_ENCODING_NOCOMPLAIN -	If set, the converter
- *				substitutes the problematic character(s) with
- *				one or more "close" characters in the
- *				destination buffer and then continues to
- *				convert the source. If clear, the converter returns
- *				immediately upon encountering an invalid byte sequence
- *				or a source character that has no mapping in the
- *				target encoding. Only for Tcl 9.x.
+ * TCL_ENCODING_PROFILE_* -	Mutually exclusive encoding profile ids. Note
+ *				these are bit masks.
+ *
+ * NOTE: THESE BIT DEFINITIONS SHOULD NOT OVERLAP WITH INTERNAL USE BITS
+ * DEFINED IN tclEncoding.c (ENCODING_INPUT et al). Be cognizant of this
+ * when adding bits.
  */
 
 #define TCL_ENCODING_START		0x01
 #define TCL_ENCODING_END		0x02
 #if TCL_MAJOR_VERSION > 8
-#   define TCL_ENCODING_STRICT			0x04
 #   define TCL_ENCODING_STOPONERROR	0x0 /* Not used any more */
 #else
-#   define TCL_ENCODING_STRICT			0x44
 #   define TCL_ENCODING_STOPONERROR	0x04
 #endif
 #define TCL_ENCODING_NO_TERMINATE	0x08
 #define TCL_ENCODING_CHAR_LIMIT		0x10
-#define TCL_ENCODING_MODIFIED		0x20
-#define TCL_ENCODING_NOCOMPLAIN		0x40
+/* Internal use bits, do not define bits in this space. See above comment */
+#define TCL_ENCODING_INTERNAL_USE_MASK  0xFF00
+/* Reserve top byte for profile values (disjoint, not a mask) */
+#define TCL_ENCODING_PROFILE_TCL8     0x01000000
+#define TCL_ENCODING_PROFILE_STRICT   0x02000000
+#define TCL_ENCODING_PROFILE_REPLACE  0x03000000
+/* Still being argued - For Tcl9, is the default strict? TODO */
+#if TCL_MAJOR_VERSION < 9
+#define TCL_ENCODING_PROFILE_DEFAULT  TCL_ENCODING_PROFILE_TCL8
+#else
+#define TCL_ENCODING_PROFILE_DEFAULT  TCL_ENCODING_PROFILE_TCL8 /* STRICT? REPLACE? TODO */
+#endif
 
 /*
  * The following definitions are the error codes returned by the conversion
@@ -1991,13 +1993,10 @@ typedef struct Tcl_EncodingType {
  * TCL_CONVERT_SYNTAX -		The source stream contained an invalid
  *				character sequence. This may occur if the
  *				input stream has been damaged or if the input
- *				encoding method was misidentified. This error
- *				is reported unless if TCL_ENCODING_NOCOMPLAIN
- *				was specified.
+ *				encoding method was misidentified.
  * TCL_CONVERT_UNKNOWN -	The source string contained a character that
  *				could not be represented in the target
- *				encoding. This error is reported unless if
- *				TCL_ENCODING_NOCOMPLAIN was specified.
+ *				encoding.
  */
 
 #define TCL_CONVERT_MULTIBYTE	(-1)
@@ -2250,10 +2249,17 @@ void *			TclStubCall(void *arg);
 
 #ifdef USE_TCL_STUBS
 #if TCL_MAJOR_VERSION < 9
+# if TCL_UTF_MAX < 4
 #   define Tcl_InitStubs(interp, version, exact) \
 	(Tcl_InitStubs)(interp, version, \
 	    (exact)|(TCL_MAJOR_VERSION<<8)|(0xFF<<16), \
 	    TCL_STUB_MAGIC)
+# else
+#   define Tcl_InitStubs(interp, version, exact) \
+	(Tcl_InitStubs)(interp, "8.7.0", \
+	    (exact)|(TCL_MAJOR_VERSION<<8)|(0xFF<<16), \
+	    TCL_STUB_MAGIC)
+# endif
 #elif TCL_RELEASE_LEVEL == TCL_FINAL_RELEASE
 #   define Tcl_InitStubs(interp, version, exact) \
 	(Tcl_InitStubs)(interp, version, \
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 381d127..1d78e7e 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -1499,7 +1499,7 @@ Tcl_CallWhenDeleted(
     AssocData *dPtr = (AssocData *)Tcl_Alloc(sizeof(AssocData));
     Tcl_HashEntry *hPtr;
 
-    sprintf(buffer, "Assoc Data Key #%d", *assocDataCounterPtr);
+    snprintf(buffer, sizeof(buffer), "Assoc Data Key #%d", *assocDataCounterPtr);
     (*assocDataCounterPtr)++;
 
     if (iPtr->assocData == NULL) {
@@ -6369,7 +6369,7 @@ ProcessUnexpectedResult(
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"command returned bad code: %d", returnCode));
     }
-    sprintf(buf, "%d", returnCode);
+    snprintf(buf, sizeof(buf), "%d", returnCode);
     Tcl_SetErrorCode(interp, "TCL", "UNEXPECTED_RESULT_CODE", buf, NULL);
 }
 
@@ -9554,24 +9554,25 @@ InjectHandler(
     Tcl_Obj **objv;
 
     if (!isProbe) {
-        /*
-         * If this is [coroinject], add the extra arguments now.
-         */
-
-        if (nargs == COROUTINE_ARGUMENTS_SINGLE_OPTIONAL) {
-            Tcl_ListObjAppendElement(NULL, listPtr,
-                    Tcl_NewStringObj("yield", TCL_INDEX_NONE));
-        } else if (nargs == COROUTINE_ARGUMENTS_ARBITRARY) {
-            Tcl_ListObjAppendElement(NULL, listPtr,
-                    Tcl_NewStringObj("yieldto", TCL_INDEX_NONE));
-        } else {
-            /*
-             * I don't think this is reachable...
-             */
+	/*
+	 * If this is [coroinject], add the extra arguments now.
+	 */
 
-            Tcl_ListObjAppendElement(NULL, listPtr, Tcl_NewWideIntObj((Tcl_WideInt)(nargs + 1U) - 1));
-        }
-        Tcl_ListObjAppendElement(NULL, listPtr, Tcl_GetObjResult(interp));
+	if (nargs == COROUTINE_ARGUMENTS_SINGLE_OPTIONAL) {
+	    Tcl_ListObjAppendElement(NULL, listPtr,
+		    Tcl_NewStringObj("yield", TCL_INDEX_NONE));
+	} else if (nargs == COROUTINE_ARGUMENTS_ARBITRARY) {
+	    Tcl_ListObjAppendElement(NULL, listPtr,
+		    Tcl_NewStringObj("yieldto", TCL_INDEX_NONE));
+	} else {
+	    /*
+	     * I don't think this is reachable...
+	     */
+	    Tcl_Obj *nargsObj;
+	    TclNewIndexObj(nargsObj, nargs);
+	    Tcl_ListObjAppendElement(NULL, listPtr, nargsObj);
+	}
+	Tcl_ListObjAppendElement(NULL, listPtr, Tcl_GetObjResult(interp));
     }
 
     /*
diff --git a/generic/tclCkalloc.c b/generic/tclCkalloc.c
index 6f31940..f81cf60 100644
--- a/generic/tclCkalloc.c
+++ b/generic/tclCkalloc.c
@@ -172,7 +172,7 @@ TclDumpMemoryInfo(
     if (clientData == NULL) {
         return 0;
     }
-    sprintf(buf,
+    snprintf(buf, sizeof(buf),
 	    "total mallocs             %10" TCL_Z_MODIFIER "u\n"
 	    "total frees               %10" TCL_Z_MODIFIER "u\n"
 	    "current packets allocated %10" TCL_Z_MODIFIER "u\n"
diff --git a/generic/tclClock.c b/generic/tclClock.c
index 1d33886..ef11a2f 100644
--- a/generic/tclClock.c
+++ b/generic/tclClock.c
@@ -1086,12 +1086,12 @@ ConvertUTCToLocalUsingC(
     } else {
 	*buffer = '+';
     }
-    sprintf(buffer+1, "%02d", diff / 3600);
+    snprintf(buffer+1, sizeof(buffer) - 1, "%02d", diff / 3600);
     diff %= 3600;
-    sprintf(buffer+3, "%02d", diff / 60);
+    snprintf(buffer+3, sizeof(buffer) - 3, "%02d", diff / 60);
     diff %= 60;
     if (diff > 0) {
-	sprintf(buffer+5, "%02d", diff);
+	snprintf(buffer+5, sizeof(buffer) - 5, "%02d", diff);
     }
     fields->tzName = Tcl_NewStringObj(buffer, -1);
     Tcl_IncrRefCount(fields->tzName);
diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index 4df1216..5dbadb8 100644
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
@@ -13,6 +13,7 @@
 
 #include "tclInt.h"
 #include "tclIO.h"
+#include "tclTomMath.h"
 #ifdef _WIN32
 #   include "tclWinInt.h"
 #endif
@@ -51,6 +52,7 @@ static Tcl_ObjCmdProc	EncodingConvertfromObjCmd;
 static Tcl_ObjCmdProc	EncodingConverttoObjCmd;
 static Tcl_ObjCmdProc	EncodingDirsObjCmd;
 static Tcl_ObjCmdProc	EncodingNamesObjCmd;
+static Tcl_ObjCmdProc	EncodingProfilesObjCmd;
 static Tcl_ObjCmdProc	EncodingSystemObjCmd;
 static inline int	ForeachAssignments(Tcl_Interp *interp,
 			    struct ForeachState *statePtr);
@@ -386,6 +388,7 @@ TclInitEncodingCmd(
 	{"convertto",   EncodingConverttoObjCmd,   TclCompileBasic1To3ArgCmd, NULL, NULL, 0},
 	{"dirs",        EncodingDirsObjCmd,        TclCompileBasic0Or1ArgCmd, NULL, NULL, 1},
 	{"names",       EncodingNamesObjCmd,       TclCompileBasic0ArgCmd,    NULL, NULL, 0},
+	{"profiles",    EncodingProfilesObjCmd,    TclCompileBasic0ArgCmd,    NULL, NULL, 0},
 	{"system",      EncodingSystemObjCmd,      TclCompileBasic0Or1ArgCmd, NULL, NULL, 1},
 	{NULL,          NULL,                      NULL,                      NULL, NULL, 0}
     };
@@ -394,6 +397,116 @@ TclInitEncodingCmd(
 }
 
 /*
+ *------------------------------------------------------------------------
+ *
+ * EncodingConvertParseOptions --
+ *
+ *    Common routine for parsing arguments passed to encoding convertfrom
+ *    and encoding convertto.
+ *
+ * Results:
+ *    TCL_OK or TCL_ERROR.
+ *
+ * Side effects:
+ *    On success,
+ *    - *encPtr is set to the encoding. Must be freed with Tcl_FreeEncoding
+ *      if non-NULL
+ *    - *dataObjPtr is set to the Tcl_Obj containing the data to encode or
+ *      decode
+ *    - *profilePtr is set to encoding error handling profile
+ *    - *failVarPtr is set to -failindex option value or NULL
+ *    On error, all of the above are uninitialized.
+ *
+ *------------------------------------------------------------------------
+ */
+static int
+EncodingConvertParseOptions (
+    Tcl_Interp *interp,    /* For error messages. May be NULL */
+    int objc,		   /* Number of arguments */
+    Tcl_Obj *const objv[], /* Argument objects as passed to command. */
+    Tcl_Encoding *encPtr,  /* Where to store the encoding */
+    Tcl_Obj **dataObjPtr,  /* Where to store ptr to Tcl_Obj containing data */
+    int *profilePtr,         /* Bit mask of encoding option profile */
+    Tcl_Obj **failVarPtr   /* Where to store -failindex option value */
+)
+{
+    static const char *const options[] = {"-profile", "-failindex", NULL};
+    enum convertfromOptions { PROFILE, FAILINDEX } optIndex;
+    Tcl_Encoding encoding;
+    Tcl_Obj *dataObj;
+    Tcl_Obj *failVarObj;
+#if TCL_MAJOR_VERSION > 8 || defined(TCL_NO_DEPRECATED)
+    int profile = TCL_ENCODING_PROFILE_TCL8; /* TODO - default for Tcl9? */
+#else
+    int profile = TCL_ENCODING_PROFILE_TCL8;
+#endif
+
+    /*
+     * Possible combinations:
+     * 1) data						-> objc = 2
+     * 2) ?options? encoding data			-> objc >= 3
+     * It is intentional that specifying option forces encoding to be
+     * specified. Less prone to user error. This should have always been
+     * the case even in 8.6 imho where there were no options (ie (1)
+     * should never have been allowed)
+     */
+
+    if (objc == 1) {
+numArgsError: /* ONLY jump here if nothing needs to be freed!!! */
+	Tcl_WrongNumArgs(interp,
+			 1,
+			 objv,
+			 "?-profile profile? ?-failindex var? encoding data");
+	((Interp *)interp)->flags |= INTERP_ALTERNATE_WRONG_ARGS;
+	Tcl_WrongNumArgs(interp, 1, objv, "data");
+	return TCL_ERROR;
+    }
+
+    failVarObj = NULL;
+    if (objc == 2) {
+	encoding = Tcl_GetEncoding(interp, NULL);
+	dataObj = objv[1];
+    } else {
+	int argIndex;
+	for (argIndex = 1; argIndex < (objc-2); ++argIndex) {
+	    if (Tcl_GetIndexFromObj(
+		    interp, objv[argIndex], options, "option", 0, &optIndex)
+		!= TCL_OK) {
+		return TCL_ERROR;
+	    }
+	    if (++argIndex == (objc - 2)) {
+		goto numArgsError;
+	    }
+	    switch (optIndex) {
+	    case PROFILE:
+		if (TclEncodingProfileNameToId(interp,
+					       Tcl_GetString(objv[argIndex]),
+					       &profile) != TCL_OK) {
+		    return TCL_ERROR;
+		}
+		break;
+	    case FAILINDEX:
+		failVarObj = objv[argIndex];
+		break;
+	    }
+	}
+	/* Get encoding after opts so no need to free it on option error */
+	if (Tcl_GetEncodingFromObj(interp, objv[objc - 2], &encoding)
+	    != TCL_OK) {
+	    return TCL_ERROR;
+	}
+	dataObj = objv[objc - 1];
+    }
+
+    *encPtr = encoding;
+    *dataObjPtr = dataObj;
+    *profilePtr = profile;
+    *failVarPtr = failVarObj;
+
+    return TCL_OK;
+}
+
+/*
  *----------------------------------------------------------------------
  *
  * EncodingConvertfromObjCmd --
@@ -419,113 +532,66 @@ EncodingConvertfromObjCmd(
     Tcl_Encoding encoding;	/* Encoding to use */
     size_t length = 0;			/* Length of the byte array being converted */
     const char *bytesPtr;	/* Pointer to the first byte of the array */
-    int flags = 0;
-    size_t result;
-    Tcl_Obj *failVarObj = NULL;
-    /*
-     * Decode parameters:
-     * Possible combinations:
-     * 1) data						-> objc = 2
-     * 2) encoding data					-> objc = 3
-     * 3) -nocomplain data				-> objc = 3
-     * 4) -nocomplain encoding data			-> objc = 4
-     * 5) -strict data				-> objc = 3
-     * 6) -strict encoding data			-> objc = 4
-     * 7) -failindex val data				-> objc = 4
-     * 8) -failindex val encoding data			-> objc = 5
-     */
+    int flags;
+    int result;
+    Tcl_Obj *failVarObj;
+    Tcl_Size errorLocation;
 
-    if (objc == 2) {
-	encoding = Tcl_GetEncoding(interp, NULL);
-	data = objv[1];
-    } else if (objc > 2 && objc < 7) {
-	int objcUnprocessed = objc;
-	data = objv[objc - 1];
-	bytesPtr = Tcl_GetString(objv[1]);
-	if (bytesPtr[0] == '-' && bytesPtr[1] == 'n'
-		&& !strncmp(bytesPtr, "-nocomplain", strlen(bytesPtr))) {
-	    flags = TCL_ENCODING_NOCOMPLAIN;
-	    objcUnprocessed--;
-	} else if (bytesPtr[0] == '-' && bytesPtr[1] == 's'
-		&& !strncmp(bytesPtr, "-strict", strlen(bytesPtr))) {
-	    flags = TCL_ENCODING_STRICT;
-	    objcUnprocessed--;
-		bytesPtr = Tcl_GetString(objv[2]);
-		if (bytesPtr[0] == '-' && bytesPtr[1] == 'f'
-			&& !strncmp(bytesPtr, "-failindex", strlen(bytesPtr))) {
-		    /* at least two additional arguments needed */
-		    if (objc < 6) {
-			goto encConvFromError;
-		    }
-		    failVarObj = objv[3];
-		    objcUnprocessed -= 2;
-		}
-	} else if (bytesPtr[0] == '-' && bytesPtr[1] == 'f'
-		&& !strncmp(bytesPtr, "-failindex", strlen(bytesPtr))) {
-	    /* at least two additional arguments needed */
-	    if (objc < 4) {
-		goto encConvFromError;
-	    }
-	    failVarObj = objv[2];
-	    flags = ENCODING_FAILINDEX;
-	    objcUnprocessed -= 2;
-		bytesPtr = Tcl_GetString(objv[3]);
-		if (bytesPtr[0] == '-' && bytesPtr[1] == 's'
-			&& !strncmp(bytesPtr, "-strict", strlen(bytesPtr))) {
-		    flags = TCL_ENCODING_STRICT;
-		    objcUnprocessed --;
-		}
-	}
-	switch (objcUnprocessed) {
-	    case 3:
-		if (Tcl_GetEncodingFromObj(interp, objv[objc - 2], &encoding) != TCL_OK) {
-		    return TCL_ERROR;
-		}
-		break;
-	    case 2:
-		encoding = Tcl_GetEncoding(interp, NULL);
-		break;
-	    default:
-		goto encConvFromError;
-	}
-    } else {
-    encConvFromError:
-	Tcl_WrongNumArgs(interp, 1, objv, "?-strict? ?-failindex var? ?encoding? data");
-	((Interp *) interp)->flags |= INTERP_ALTERNATE_WRONG_ARGS;
-	Tcl_WrongNumArgs(interp, 1, objv, "-nocomplain ?encoding? data");
+    if (EncodingConvertParseOptions(
+	    interp, objc, objv, &encoding, &data, &flags, &failVarObj)
+	!= TCL_OK) {
 	return TCL_ERROR;
     }
 
     /*
-     * Convert the string into a byte array in 'ds'
+     * Convert the string into a byte array in 'ds'.
      */
     bytesPtr = (char *) Tcl_GetBytesFromObj(interp, data, &length);
+
     if (bytesPtr == NULL) {
 	return TCL_ERROR;
     }
-    result = Tcl_ExternalToUtfDStringEx(encoding, bytesPtr, length,
-	    flags, &ds);
-    if ((!(flags & TCL_ENCODING_NOCOMPLAIN) || ((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT)) && (result != TCL_INDEX_NONE)) {
-	if (failVarObj != NULL) {
-	    if (Tcl_ObjSetVar2(interp, failVarObj, NULL, Tcl_NewWideIntObj(result), TCL_LEAVE_ERR_MSG) == NULL) {
-		return TCL_ERROR;
-	    }
-	} else {
-	    char buf[TCL_INTEGER_SPACE];
-	    sprintf(buf, "%" TCL_Z_MODIFIER "u", result);
-	    Tcl_SetObjResult(interp, Tcl_ObjPrintf("unexpected byte sequence starting at index %"
-		    TCL_Z_MODIFIER "u: '\\x%X'", result, UCHAR(bytesPtr[result])));
-	    Tcl_SetErrorCode(interp, "TCL", "ENCODING", "ILLEGALSEQUENCE",
-		    buf, NULL);
-	    Tcl_DStringFree(&ds);
+    result = Tcl_ExternalToUtfDStringEx(interp, encoding, bytesPtr, length, flags,
+                                        &ds, failVarObj ? &errorLocation : NULL);
+    /* NOTE: ds must be freed beyond this point even on error */
+    switch (result) {
+    case TCL_OK:
+        errorLocation = TCL_INDEX_NONE;
+        break;
+    case TCL_ERROR:
+	/* Error in parameters. Should not happen. interp will have error */
+        Tcl_DStringFree(&ds);
+	return TCL_ERROR;
+    default:
+	/*
+	 * One of the TCL_CONVERT_* errors. If we were not interested in the
+	 * error location, interp result would already have been filled in
+	 * and we can just return the error. Otherwise, we have to return
+	 * what could be decoded and the returned error location.
+	 */
+	if (failVarObj == NULL) {
+            Tcl_DStringFree(&ds);
 	    return TCL_ERROR;
 	}
-    } else if (failVarObj != NULL) {
-	if (Tcl_ObjSetVar2(interp, failVarObj, NULL, Tcl_NewIntObj(-1), TCL_LEAVE_ERR_MSG) == NULL) {
+        break;
+    }
+
+    /*
+     * TCL_OK or a TCL_CONVERT_* error where the caller wants back as much
+     * data as was converted.
+     */
+    if (failVarObj) {
+	Tcl_Obj *failIndex;
+	TclNewIndexObj(failIndex, errorLocation);
+	if (Tcl_ObjSetVar2(interp,
+			   failVarObj,
+			   NULL,
+			   failIndex,
+			   TCL_LEAVE_ERR_MSG) == NULL) {
+	    Tcl_DStringFree(&ds);
 	    return TCL_ERROR;
 	}
     }
-
     /*
      * Note that we cannot use Tcl_DStringResult here because it will
      * truncate the string at the first null byte.
@@ -533,9 +599,7 @@ EncodingConvertfromObjCmd(
 
     Tcl_SetObjResult(interp, Tcl_DStringToObj(&ds));
 
-    /*
-     * We're done with the encoding
-     */
+    /* We're done with the encoding */
 
     Tcl_FreeEncoding(encoding);
     return TCL_OK;
@@ -568,80 +632,14 @@ EncodingConverttoObjCmd(
     Tcl_Encoding encoding;	/* Encoding to use */
     size_t length;			/* Length of the string being converted */
     const char *stringPtr;	/* Pointer to the first byte of the string */
-    size_t result;
-    int flags = 0;
-    Tcl_Obj *failVarObj = NULL;
-
-    /*
-     * Decode parameters:
-     * Possible combinations:
-     * 1) data						-> objc = 2
-     * 2) encoding data					-> objc = 3
-     * 3) -nocomplain data				-> objc = 3
-     * 4) -nocomplain encoding data			-> objc = 4
-     * 5) -failindex val data				-> objc = 4
-     * 6) -failindex val encoding data			-> objc = 5
-     */
-
-    if (objc == 2) {
-	encoding = Tcl_GetEncoding(interp, NULL);
-	data = objv[1];
-    } else if (objc > 2 && objc < 7) {
-	int objcUnprocessed = objc;
-	data = objv[objc - 1];
-	stringPtr = Tcl_GetString(objv[1]);
-	if (stringPtr[0] == '-' && stringPtr[1] == 'n'
-		&& !strncmp(stringPtr, "-nocomplain", strlen(stringPtr))) {
-	    flags = TCL_ENCODING_NOCOMPLAIN;
-	    objcUnprocessed--;
-	} else if (stringPtr[0] == '-' && stringPtr[1] == 's'
-		&& !strncmp(stringPtr, "-strict", strlen(stringPtr))) {
-	    flags = TCL_ENCODING_STRICT;
-	    objcUnprocessed--;
-		stringPtr = Tcl_GetString(objv[2]);
-		if (stringPtr[0] == '-' && stringPtr[1] == 'f'
-			&& !strncmp(stringPtr, "-failindex", strlen(stringPtr))) {
-		    /* at least two additional arguments needed */
-		    if (objc < 6) {
-			goto encConvToError;
-		    }
-		    failVarObj = objv[3];
-		    objcUnprocessed -= 2;
-		}
-	} else if (stringPtr[0] == '-' && stringPtr[1] == 'f'
-		&& !strncmp(stringPtr, "-failindex", strlen(stringPtr))) {
-	    /* at least two additional arguments needed */
-	    if (objc < 4) {
-		goto encConvToError;
-	    }
-	    failVarObj = objv[2];
-	    flags = TCL_ENCODING_STOPONERROR;
-	    objcUnprocessed -= 2;
-		stringPtr = Tcl_GetString(objv[3]);
-		if (stringPtr[0] == '-' && stringPtr[1] == 's'
-			&& !strncmp(stringPtr, "-strict", strlen(stringPtr))) {
-		    flags = TCL_ENCODING_STRICT;
-		    objcUnprocessed --;
-		}
-	}
-	switch (objcUnprocessed) {
-	    case 3:
-		if (Tcl_GetEncodingFromObj(interp, objv[objc - 2], &encoding) != TCL_OK) {
-		    return TCL_ERROR;
-		}
-		break;
-	    case 2:
-		encoding = Tcl_GetEncoding(interp, NULL);
-		break;
-	    default:
-		goto encConvToError;
-	}
-    } else {
-    encConvToError:
-	Tcl_WrongNumArgs(interp, 1, objv, "?-strict? ?-failindex var? ?encoding? data");
-	((Interp *) interp)->flags |= INTERP_ALTERNATE_WRONG_ARGS;
-	Tcl_WrongNumArgs(interp, 1, objv, "-nocomplain ?encoding? data");
+    int result;
+    int flags;
+    Tcl_Obj *failVarObj;
+    Tcl_Size errorLocation;
 
+    if (EncodingConvertParseOptions(
+	    interp, objc, objv, &encoding, &data, &flags, &failVarObj)
+	!= TCL_OK) {
 	return TCL_ERROR;
     }
 
@@ -650,40 +648,54 @@ EncodingConverttoObjCmd(
      */
 
     stringPtr = Tcl_GetStringFromObj(data, &length);
-    result = Tcl_UtfToExternalDStringEx(encoding, stringPtr, length,
-	    flags, &ds);
-    if ((!(flags & TCL_ENCODING_NOCOMPLAIN) || ((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT)) && (result != TCL_INDEX_NONE)) {
-	if (failVarObj != NULL) {
-	    /* I hope, wide int will cover size_t data type */
-	    if (Tcl_ObjSetVar2(interp, failVarObj, NULL, Tcl_NewWideIntObj(result), TCL_LEAVE_ERR_MSG) == NULL) {
-		return TCL_ERROR;
-	    }
-	} else {
-	    size_t pos = Tcl_NumUtfChars(stringPtr, result);
-	    int ucs4;
-	    char buf[TCL_INTEGER_SPACE];
-	    TclUtfToUCS4(&stringPtr[result], &ucs4);
-	    sprintf(buf, "%" TCL_Z_MODIFIER "u", result);
-	    Tcl_SetObjResult(interp, Tcl_ObjPrintf("unexpected character at index %"
-		    TCL_Z_MODIFIER "u: 'U+%06X'", pos, ucs4));
-	    Tcl_SetErrorCode(interp, "TCL", "ENCODING", "ILLEGALSEQUENCE",
-		    buf, NULL);
-	    Tcl_DStringFree(&ds);
+    result = Tcl_UtfToExternalDStringEx(interp, encoding, stringPtr, length, flags,
+                                        &ds, failVarObj ? &errorLocation : NULL);
+    /* NOTE: ds must be freed beyond this point even on error */
+
+    switch (result) {
+    case TCL_OK:
+	errorLocation = TCL_INDEX_NONE;
+	break;
+    case TCL_ERROR:
+	/* Error in parameters. Should not happen. interp will have error */
+        Tcl_DStringFree(&ds);
+	return TCL_ERROR;
+    default:
+	/*
+	 * One of the TCL_CONVERT_* errors. If we were not interested in the
+	 * error location, interp result would already have been filled in
+	 * and we can just return the error. Otherwise, we have to return
+	 * what could be decoded and the returned error location.
+	 */
+	if (failVarObj == NULL) {
+            Tcl_DStringFree(&ds);
 	    return TCL_ERROR;
 	}
-    } else if (failVarObj != NULL) {
-	if (Tcl_ObjSetVar2(interp, failVarObj, NULL, Tcl_NewIntObj(-1), TCL_LEAVE_ERR_MSG) == NULL) {
+        break;
+    }
+    /*
+     * TCL_OK or a TCL_CONVERT_* error where the caller wants back as much
+     * data as was converted.
+     */
+    if (failVarObj) {
+	Tcl_Obj *failIndex;
+	TclNewIndexObj(failIndex, errorLocation);
+	if (Tcl_ObjSetVar2(interp,
+			   failVarObj,
+			   NULL,
+			   failIndex,
+			   TCL_LEAVE_ERR_MSG) == NULL) {
+	    Tcl_DStringFree(&ds);
 	    return TCL_ERROR;
 	}
     }
+
     Tcl_SetObjResult(interp,
 		     Tcl_NewByteArrayObj((unsigned char*) Tcl_DStringValue(&ds),
 					 Tcl_DStringLength(&ds)));
     Tcl_DStringFree(&ds);
 
-    /*
-     * We're done with the encoding
-     */
+    /* We're done with the encoding */
 
     Tcl_FreeEncoding(encoding);
     return TCL_OK;
@@ -768,6 +780,34 @@ EncodingNamesObjCmd(
 /*
  *-----------------------------------------------------------------------------
  *
+ * EncodingProfilesObjCmd --
+ *
+ *	This command returns a list of the available encoding profiles
+ *
+ * Results:
+ *	Returns a standard Tcl result
+ *
+ *-----------------------------------------------------------------------------
+ */
+
+int
+EncodingProfilesObjCmd(
+    TCL_UNUSED(void *),
+    Tcl_Interp* interp,	    /* Tcl interpreter */
+    int objc,		    /* Number of command line args */
+    Tcl_Obj* const objv[])  /* Vector of command line args */
+{
+    if (objc > 1) {
+	Tcl_WrongNumArgs(interp, 1, objv, NULL);
+	return TCL_ERROR;
+    }
+    TclGetEncodingProfiles(interp);
+    return TCL_OK;
+}
+
+/*
+ *-----------------------------------------------------------------------------
+ *
  * EncodingSystemObjCmd --
  *
  *	This command retrieves or changes the system encoding
diff --git a/generic/tclCmdIL.c b/generic/tclCmdIL.c
index e1949a5..92014bd 100644
--- a/generic/tclCmdIL.c
+++ b/generic/tclCmdIL.c
@@ -2272,6 +2272,7 @@ Tcl_JoinObjCmd(
 		    return TCL_ERROR;
 		}
 		Tcl_AppendObjToObj(resObjPtr, valueObj);
+		Tcl_DecrRefCount(valueObj);
 	    }
 	} else {
 	    for (i = 0;  i < listLen;  i++) {
diff --git a/generic/tclCompCmdsSZ.c b/generic/tclCompCmdsSZ.c
index b86aa43..47999d9 100644
--- a/generic/tclCompCmdsSZ.c
+++ b/generic/tclCompCmdsSZ.c
@@ -897,7 +897,7 @@ TclCompileStringLenCmd(
 	char buf[TCL_INTEGER_SPACE];
 	size_t len = Tcl_GetCharLength(objPtr);
 
-	len = sprintf(buf, "%" TCL_Z_MODIFIER "u", len);
+	len = snprintf(buf, sizeof(buf), "%" TCL_Z_MODIFIER "u", len);
 	PushLiteral(envPtr, buf, len);
     } else {
 	SetLineInformation(1);
@@ -3124,7 +3124,7 @@ IssueTryClausesInstructions(
 
     for (i=0 ; i<numHandlers ; i++) {
 	noError[i] = -1;
-	sprintf(buf, "%d", matchCodes[i]);
+	snprintf(buf, sizeof(buf), "%d", matchCodes[i]);
 	OP(				DUP);
 	PushLiteral(envPtr, buf, strlen(buf));
 	OP(				EQ);
@@ -3337,7 +3337,7 @@ IssueTryClausesFinallyInstructions(
 	int noTrapError, trapError;
 	const char *p;
 
-	sprintf(buf, "%d", matchCodes[i]);
+	snprintf(buf, sizeof(buf), "%d", matchCodes[i]);
 	OP(				DUP);
 	PushLiteral(envPtr, buf, strlen(buf));
 	OP(				EQ);
@@ -4087,7 +4087,7 @@ CompileAssociativeBinaryOpCmd(
     if (words > 3) {
 	/*
 	 * Reverse order of arguments to get precise agreement with [expr] in
-	 * calcuations, including roundoff errors.
+	 * calculations, including roundoff errors.
 	 */
 
 	OP4(	REVERSE, words-1);
@@ -4538,7 +4538,7 @@ TclCompileMinusOpCmd(
 
     /*
      * Reverse order of arguments to get precise agreement with [expr] in
-     * calcuations, including roundoff errors.
+     * calculations, including roundoff errors.
      */
 
     TclEmitInstInt4(INST_REVERSE, words-1, envPtr);
@@ -4582,7 +4582,7 @@ TclCompileDivOpCmd(
 
     /*
      * Reverse order of arguments to get precise agreement with [expr] in
-     * calcuations, including roundoff errors.
+     * calculations, including roundoff errors.
      */
 
     TclEmitInstInt4(INST_REVERSE, words-1, envPtr);
diff --git a/generic/tclCompile.h b/generic/tclCompile.h
index 035edac..24bc604 100644
--- a/generic/tclCompile.h
+++ b/generic/tclCompile.h
@@ -1817,7 +1817,7 @@ MODULE_SCOPE void TclDTraceInfo(Tcl_Obj *info, const char **args, int *argsi);
     FILE *tclDTraceDebugLog = NULL;				\
     void TclDTraceOpenDebugLog(void) {				\
 	char n[35];						\
-	sprintf(n, "/tmp/tclDTraceDebug-%" TCL_Z_MODIFIER "u.log", \
+	snprintf(n, sizeof(n), "/tmp/tclDTraceDebug-%" TCL_Z_MODIFIER "u.log", \
 		(size_t) getpid());			\
 	tclDTraceDebugLog = fopen(n, "a");			\
     }
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 84c6d04..ec9a49a 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -1766,13 +1766,17 @@ EXTERN const char *	Tcl_UtfPrev(const char *src, const char *start);
 /* 657 */
 EXTERN int		Tcl_UniCharIsUnicode(int ch);
 /* 658 */
-EXTERN Tcl_Size		Tcl_ExternalToUtfDStringEx(Tcl_Encoding encoding,
-				const char *src, Tcl_Size srcLen, int flags,
-				Tcl_DString *dsPtr);
+EXTERN int		Tcl_ExternalToUtfDStringEx(Tcl_Interp *interp,
+				Tcl_Encoding encoding, const char *src,
+				Tcl_Size srcLen, int flags,
+				Tcl_DString *dsPtr,
+				Tcl_Size *errorLocationPtr);
 /* 659 */
-EXTERN Tcl_Size		Tcl_UtfToExternalDStringEx(Tcl_Encoding encoding,
-				const char *src, Tcl_Size srcLen, int flags,
-				Tcl_DString *dsPtr);
+EXTERN int		Tcl_UtfToExternalDStringEx(Tcl_Interp *interp,
+				Tcl_Encoding encoding, const char *src,
+				Tcl_Size srcLen, int flags,
+				Tcl_DString *dsPtr,
+				Tcl_Size *errorLocationPtr);
 /* 660 */
 EXTERN int		Tcl_AsyncMarkFromSignal(Tcl_AsyncHandler async,
 				int sigNumber);
@@ -2529,8 +2533,8 @@ typedef struct TclStubs {
     const char * (*tcl_UtfNext) (const char *src); /* 655 */
     const char * (*tcl_UtfPrev) (const char *src, const char *start); /* 656 */
     int (*tcl_UniCharIsUnicode) (int ch); /* 657 */
-    Tcl_Size (*tcl_ExternalToUtfDStringEx) (Tcl_Encoding encoding, const char *src, Tcl_Size srcLen, int flags, Tcl_DString *dsPtr); /* 658 */
-    Tcl_Size (*tcl_UtfToExternalDStringEx) (Tcl_Encoding encoding, const char *src, Tcl_Size srcLen, int flags, Tcl_DString *dsPtr); /* 659 */
+    int (*tcl_ExternalToUtfDStringEx) (Tcl_Interp *interp, Tcl_Encoding encoding, const char *src, Tcl_Size srcLen, int flags, Tcl_DString *dsPtr, Tcl_Size *errorLocationPtr); /* 658 */
+    int (*tcl_UtfToExternalDStringEx) (Tcl_Interp *interp, Tcl_Encoding encoding, const char *src, Tcl_Size srcLen, int flags, Tcl_DString *dsPtr, Tcl_Size *errorLocationPtr); /* 659 */
     int (*tcl_AsyncMarkFromSignal) (Tcl_AsyncHandler async, int sigNumber); /* 660 */
     int (*tcl_ListObjGetElements) (Tcl_Interp *interp, Tcl_Obj *listPtr, size_t *objcPtr, Tcl_Obj ***objvPtr); /* 661 */
     int (*tcl_ListObjLength) (Tcl_Interp *interp, Tcl_Obj *listPtr, size_t *lengthPtr); /* 662 */
@@ -3956,12 +3960,12 @@ extern const TclStubs *tclStubsPtr;
 
 #undef Tcl_UtfToExternalDString
 #define Tcl_UtfToExternalDString(encoding, src, len, ds) \
-	(Tcl_UtfToExternalDStringEx((encoding), (src), (len), \
-	TCL_ENCODING_NOCOMPLAIN, (ds)), Tcl_DStringValue(ds))
+	(Tcl_UtfToExternalDStringEx(NULL, (encoding), (src), (len), \
+	TCL_ENCODING_PROFILE_TCL8, (ds), NULL), Tcl_DStringValue(ds))
 #undef Tcl_ExternalToUtfDString
 #define Tcl_ExternalToUtfDString(encoding, src, len, ds) \
-	(Tcl_ExternalToUtfDStringEx((encoding), (src), (len), \
-	TCL_ENCODING_NOCOMPLAIN, (ds)), Tcl_DStringValue(ds))
+	(Tcl_ExternalToUtfDStringEx(NULL, (encoding), (src), (len), \
+	TCL_ENCODING_PROFILE_TCL8, (ds), NULL), Tcl_DStringValue(ds))
 
 #if defined(USE_TCL_STUBS)
 #   if defined(_WIN32) && defined(_WIN64)
@@ -3976,7 +3980,7 @@ extern const TclStubs *tclStubsPtr;
 		    _t.reserved = -1; \
 		    tclStubsPtr->tcl_GetTime((&_t.now)); \
 		    if (_t.reserved != -1) { \
-			_t.now.usec = _t.reserved; \
+			_t.now.usec = (long) _t.reserved; \
 		    } \
 		    *(t) = _t.now; \
 		} while (0)
diff --git a/generic/tclDisassemble.c b/generic/tclDisassemble.c
index c06731f..f1d974b 100644
--- a/generic/tclDisassemble.c
+++ b/generic/tclDisassemble.c
@@ -571,22 +571,22 @@ FormatInstruction(
 	case OPERAND_UINT4:
 	    opnd = TclGetUInt4AtPtr(pc+numBytes); numBytes += 4;
 	    if (opCode == INST_START_CMD) {
-		sprintf(suffixBuffer+strlen(suffixBuffer),
+		snprintf(suffixBuffer+strlen(suffixBuffer), sizeof(suffixBuffer) - strlen(suffixBuffer),
 			", %u cmds start here", opnd);
 	    }
 	    Tcl_AppendPrintfToObj(bufferObj, "%u ", opnd);
 	    break;
 	case OPERAND_OFFSET1:
 	    opnd = TclGetInt1AtPtr(pc+numBytes); numBytes++;
-	    sprintf(suffixBuffer, "pc %u", pcOffset+opnd);
+	    snprintf(suffixBuffer, sizeof(suffixBuffer), "pc %u", pcOffset+opnd);
 	    Tcl_AppendPrintfToObj(bufferObj, "%+d ", opnd);
 	    break;
 	case OPERAND_OFFSET4:
 	    opnd = TclGetInt4AtPtr(pc+numBytes); numBytes += 4;
 	    if (opCode == INST_START_CMD) {
-		sprintf(suffixBuffer, "next cmd at pc %u", pcOffset+opnd);
+		snprintf(suffixBuffer, sizeof(suffixBuffer), "next cmd at pc %u", pcOffset+opnd);
 	    } else {
-		sprintf(suffixBuffer, "pc %u", pcOffset+opnd);
+		snprintf(suffixBuffer, sizeof(suffixBuffer), "pc %u", pcOffset+opnd);
 	    }
 	    Tcl_AppendPrintfToObj(bufferObj, "%+d ", opnd);
 	    break;
@@ -632,9 +632,9 @@ FormatInstruction(
 		    localPtr = localPtr->nextPtr;
 		}
 		if (TclIsVarTemporary(localPtr)) {
-		    sprintf(suffixBuffer, "temp var %u", opnd);
+		    snprintf(suffixBuffer, sizeof(suffixBuffer), "temp var %u", opnd);
 		} else {
-		    sprintf(suffixBuffer, "var ");
+		    snprintf(suffixBuffer, sizeof(suffixBuffer), "var ");
 		    suffixSrc = localPtr->name;
 		}
 	    }
@@ -836,7 +836,7 @@ UpdateStringOfInstName(
     if (inst >= LAST_INST_OPCODE) {
 	dst = Tcl_InitStringRep(objPtr, NULL, TCL_INTEGER_SPACE + 5);
 	TclOOM(dst, TCL_INTEGER_SPACE + 5);
-        sprintf(dst, "inst_%" TCL_Z_MODIFIER "u", inst);
+        snprintf(dst, TCL_INTEGER_SPACE + 5, "inst_%" TCL_Z_MODIFIER "u", inst);
 	(void) Tcl_InitStringRep(objPtr, NULL, strlen(dst));
     } else {
 	const char *s = tclInstructionTable[inst].name;
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 61e3236..2a96383 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -188,6 +188,36 @@ static Tcl_Encoding systemEncoding = NULL;
 Tcl_Encoding tclIdentityEncoding = NULL;
 
 /*
+ * Names of encoding profiles and corresponding integer values.
+ * Keep alphabetical order for error messages.
+ */
+static struct TclEncodingProfiles {
+    const char *name;
+    int value;
+} encodingProfiles[] = {
+    {"replace", TCL_ENCODING_PROFILE_REPLACE},
+    {"strict", TCL_ENCODING_PROFILE_STRICT},
+    {"tcl8", TCL_ENCODING_PROFILE_TCL8},
+};
+#define PROFILE_TCL8(flags_)                                           \
+    ((CHANNEL_PROFILE_GET(flags_) == TCL_ENCODING_PROFILE_TCL8)   \
+     || (CHANNEL_PROFILE_GET(flags_) == 0                         \
+	 && TCL_ENCODING_PROFILE_DEFAULT == TCL_ENCODING_PROFILE_TCL8))
+#define PROFILE_STRICT(flags_)                                         \
+    ((CHANNEL_PROFILE_GET(flags_) == TCL_ENCODING_PROFILE_STRICT) \
+     || (CHANNEL_PROFILE_GET(flags_) == 0                         \
+	 && TCL_ENCODING_PROFILE_DEFAULT == TCL_ENCODING_PROFILE_STRICT))
+#define PROFILE_REPLACE(flags_)                                         \
+    ((CHANNEL_PROFILE_GET(flags_) == TCL_ENCODING_PROFILE_REPLACE) \
+     || (CHANNEL_PROFILE_GET(flags_) == 0                          \
+	 && TCL_ENCODING_PROFILE_DEFAULT == TCL_ENCODING_PROFILE_REPLACE))
+
+#define UNICODE_REPLACE_CHAR ((Tcl_UniChar)0xFFFD)
+#define SURROGATE(c_)      (((c_) & ~0x7FF) == 0xD800)
+#define HIGH_SURROGATE(c_) (((c_) & ~0x3FF) == 0xD800)
+#define LOW_SURROGATE(c_)  (((c_) & ~0x3FF) == 0xDC00)
+
+/*
  * The following variable is used in the sparse matrix code for a
  * TableEncoding to represent a page in the table that has no entries.
  */
@@ -230,6 +260,7 @@ static Tcl_EncodingConvertProc	UtfToUtfProc;
 static Tcl_EncodingConvertProc	Iso88591FromUtfProc;
 static Tcl_EncodingConvertProc	Iso88591ToUtfProc;
 
+
 /*
  * A Tcl_ObjType for holding a cached Tcl_Encoding in the twoPtrValue.ptr1 field
  * of the internalrep. This should help the lifetime of encodings be more useful.
@@ -522,11 +553,16 @@ FillEncodingFileMap(void)
  *---------------------------------------------------------------------------
  */
 
-/* Since TCL_ENCODING_MODIFIED is only used for utf-8/cesu-8 and
- * TCL_ENCODING_LE is only used for  utf-16/utf-32/ucs-2. re-use the same value */
-#define TCL_ENCODING_LE		TCL_ENCODING_MODIFIED	/* Little-endian encoding */
+/*
+ * NOTE: THESE BIT DEFINITIONS SHOULD NOT OVERLAP WITH INTERNAL USE BITS
+ * DEFINED IN tcl.h (TCL_ENCODING_* et al). Be cognizant of this
+ * when adding bits. TODO - should really be defined in a single file.
+ *
+ * To prevent conflicting bits, only define bits within 0xff00 mask here.
+ */
+#define TCL_ENCODING_LE	0x100   /* Used to distinguish LE/BE variants */
 #define ENCODING_UTF	0x200	/* For UTF-8 encoding, allow 4-byte output sequences */
-#define ENCODING_INPUT	0x400 /* For UTF-8/CESU-8 encoding, means external -> internal */
+#define ENCODING_INPUT	0x400   /* For UTF-8/CESU-8 encoding, means external -> internal */
 
 void
 TclInitEncodingSubsystem(void)
@@ -539,12 +575,16 @@ TclInitEncodingSubsystem(void)
         char c;
         short s;
     } isLe;
+    int leFlags;
 
     if (encodingsInitialized) {
 	return;
     }
 
-    isLe.s = TCL_ENCODING_LE;
+    /* Note: This DEPENDS on TCL_ENCODING_LE being defined in least sig byte */
+    isLe.s = 1;
+    leFlags = isLe.c ? TCL_ENCODING_LE : 0;
+
     Tcl_MutexLock(&encodingMutex);
     Tcl_InitHashTable(&encodingTable, TCL_STRING_KEYS);
     Tcl_MutexUnlock(&encodingMutex);
@@ -585,7 +625,7 @@ TclInitEncodingSubsystem(void)
     type.clientData	= INT2PTR(0);
     Tcl_CreateEncoding(&type);
     type.encodingName   = "ucs-2";
-    type.clientData	= INT2PTR(isLe.c);
+    type.clientData	= INT2PTR(leFlags);
     Tcl_CreateEncoding(&type);
 
     type.toUtfProc	= Utf32ToUtfProc;
@@ -599,7 +639,7 @@ TclInitEncodingSubsystem(void)
     type.clientData	= INT2PTR(0);
     Tcl_CreateEncoding(&type);
     type.encodingName   = "utf-32";
-    type.clientData	= INT2PTR(isLe.c);
+    type.clientData	= INT2PTR(leFlags);
     Tcl_CreateEncoding(&type);
 
     type.toUtfProc	= Utf16ToUtfProc;
@@ -613,7 +653,7 @@ TclInitEncodingSubsystem(void)
     type.clientData	= INT2PTR(ENCODING_UTF);
     Tcl_CreateEncoding(&type);
     type.encodingName   = "utf-16";
-    type.clientData	= INT2PTR(isLe.c|ENCODING_UTF);
+    type.clientData	= INT2PTR(leFlags|ENCODING_UTF);
     Tcl_CreateEncoding(&type);
 
 #ifndef TCL_NO_DEPRECATED
@@ -897,7 +937,7 @@ Tcl_GetEncodingNames(
 	Encoding *encodingPtr = (Encoding *)Tcl_GetHashValue(hPtr);
 
 	Tcl_CreateHashEntry(&table,
-		Tcl_NewStringObj(encodingPtr->name, -1), &dummy);
+		Tcl_NewStringObj(encodingPtr->name, TCL_INDEX_NONE), &dummy);
     }
     Tcl_MutexUnlock(&encodingMutex);
 
@@ -1114,7 +1154,8 @@ Tcl_ExternalToUtfDString(
     Tcl_DString *dstPtr)	/* Uninitialized or free DString in which the
 				 * converted string is stored. */
 {
-    Tcl_ExternalToUtfDStringEx(encoding, src, srcLen, TCL_ENCODING_NOCOMPLAIN, dstPtr);
+    Tcl_ExternalToUtfDStringEx(
+	NULL, encoding, src, srcLen, TCL_ENCODING_PROFILE_TCL8, dstPtr, NULL);
     return Tcl_DStringValue(dstPtr);
 }
 
@@ -1128,34 +1169,53 @@ Tcl_ExternalToUtfDString(
  *	The parameter flags controls the behavior, if any of the bytes in
  *	the source buffer are invalid or cannot be represented in utf-8.
  *	Possible flags values:
- *	TCL_ENCODING_NOCOMPLAIN: replace invalid characters/bytes by a default
- *	fallback character. Always return -1 (Default in Tcl 8.7).
- *	TCL_ENCODING_MODIFIED: convert NULL bytes to \xC0\x80 in stead of 0x00.
- *	Only valid for "utf-8" and "cesu-8". This flag may be used together
- *	with the other flags.
+ *	target encoding. It should be composed by OR-ing the following:
+ *	- *At most one* of TCL_ENCODING_PROFILE{DEFAULT,TCL8,STRICT}
+ *	- TCL_ENCODING_STOPONERROR: Backward compatibility. Sets the profile
+ *	  to TCL_ENCODING_PROFILE_STRICT overriding any specified profile flags
+ *      Any other flag bits will cause an error to be returned (for future
+ *      compatibility)
  *
  * Results:
- *	The converted bytes are stored in the DString, which is then NULL
- *	terminated in an encoding-specific manner. The return value is
- *	the error position in the source string or -1 if no conversion error
- *	is reported.
-  *
+ *      The return value is one of
+ *        TCL_OK: success. Converted string in *dstPtr
+ *        TCL_ERROR: error in passed parameters. Error message in interp
+ *        TCL_CONVERT_MULTIBYTE: source ends in truncated multibyte sequence
+ *        TCL_CONVERT_SYNTAX: source is not conformant to encoding definition
+ *        TCL_CONVERT_UNKNOWN: source contained a character that could not
+ *            be represented in target encoding.
+ *
  * Side effects:
- *	None.
+ *
+ *      TCL_OK: The converted bytes are stored in the DString and NUL
+ *          terminated in an encoding-specific manner.
+ *      TCL_ERROR: an error, message is stored in the interp if not NULL.
+ *      TCL_CONVERT_*: if errorLocPtr is NULL, an error message is stored
+ *          in the interpreter (if not NULL). If errorLocPtr is not NULL,
+ *          no error message is stored as it is expected the caller is
+ *          interested in whatever is decoded so far and not treating this
+ *          as an error condition.
+ *
+ *      In addition, *dstPtr is always initialized and must be cleared
+ *      by the caller irrespective of the return code.
  *
  *-------------------------------------------------------------------------
  */
 
-Tcl_Size
+int
 Tcl_ExternalToUtfDStringEx(
+    Tcl_Interp *interp,         /* For error messages. May be NULL. */
     Tcl_Encoding encoding,	/* The encoding for the source string, or NULL
 				 * for the default system encoding. */
     const char *src,		/* Source string in specified encoding. */
     Tcl_Size srcLen,			/* Source string length in bytes, or < 0 for
 				 * encoding-specific string length. */
     int flags,			/* Conversion control flags. */
-    Tcl_DString *dstPtr)	/* Uninitialized or free DString in which the
+    Tcl_DString *dstPtr,	/* Uninitialized or free DString in which the
 				 * converted string is stored. */
+    Tcl_Size *errorLocPtr)      /* Where to store the error location
+                                   (or TCL_INDEX_NONE if no error). May
+				   be NULL. */
 {
     char *dst;
     Tcl_EncodingState state;
@@ -1164,14 +1224,27 @@ Tcl_ExternalToUtfDStringEx(
     Tcl_Size dstLen, soFar;
     const char *srcStart = src;
 
+    /* DO FIRST - Must always be initialized before returning */
     Tcl_DStringInit(dstPtr);
+
+    if (flags & (TCL_ENCODING_START|TCL_ENCODING_END)) {
+	/* TODO - what other flags are illegal? - See TIP 656 */
+	Tcl_SetObjResult(
+	    interp,
+	    Tcl_NewStringObj(
+		"Parameter error: TCL_ENCODING_{START,STOP} bits set in flags.",
+		TCL_INDEX_NONE));
+	Tcl_SetErrorCode(interp, "TCL", "ENCODING", "ILLEGALFLAGS", NULL);
+	return TCL_ERROR;
+    }
+
     dst = Tcl_DStringValue(dstPtr);
     dstLen = dstPtr->spaceAvl - 1;
 
     if (encoding == NULL) {
 	encoding = systemEncoding;
     }
-    encodingPtr = (Encoding *) encoding;
+    encodingPtr = (Encoding *)encoding;
 
     if (src == NULL) {
 	srcLen = 0;
@@ -1213,8 +1286,31 @@ Tcl_ExternalToUtfDStringEx(
 	 */
 	if ((result != TCL_CONVERT_NOSPACE) &&
 	    !(result == TCL_CONVERT_MULTIBYTE && (flags & TCL_ENCODING_END))) {
+	    Tcl_Size nBytesProcessed = (src - srcStart);
+
 	    Tcl_DStringSetLength(dstPtr, soFar);
-	    return (result == TCL_OK) ? TCL_INDEX_NONE : (Tcl_Size)(src - srcStart);
+	    if (errorLocPtr) {
+		/*
+		 * Do not write error message into interpreter if caller
+		 * wants to know error location.
+		 */
+		*errorLocPtr = result == TCL_OK ? TCL_INDEX_NONE : nBytesProcessed;
+	    } else {
+		/* Caller wants error message on failure */
+		if (result != TCL_OK && interp != NULL) {
+		    char buf[TCL_INTEGER_SPACE];
+		    snprintf(buf, sizeof(buf), "%" TCL_Z_MODIFIER "u", nBytesProcessed);
+		    Tcl_SetObjResult(
+			interp,
+			Tcl_ObjPrintf("unexpected byte sequence starting at index %"
+				      TCL_Z_MODIFIER "u: '\\x%02X'",
+				      nBytesProcessed,
+				      UCHAR(srcStart[nBytesProcessed])));
+		    Tcl_SetErrorCode(
+			interp, "TCL", "ENCODING", "ILLEGALSEQUENCE", buf, NULL);
+		}
+	    }
+	    return result;
 	}
 
 	flags &= ~TCL_ENCODING_START;
@@ -1319,6 +1415,9 @@ Tcl_ExternalToUtf(
     }
 
     if (!noTerminate) {
+	if ((int) dstLen < 1) {
+	    return TCL_CONVERT_NOSPACE;
+	}
 	/*
 	 * If there are any null characters in the middle of the buffer,
 	 * they will converted to the UTF-8 null character (\xC0\x80). To get
@@ -1327,6 +1426,10 @@ Tcl_ExternalToUtf(
 	 */
 
 	dstLen--;
+    } else {
+	if (dstLen <= 0 && srcLen > 0) {
+	    return TCL_CONVERT_NOSPACE;
+	}
     }
     if (encodingPtr->toUtfProc == UtfToUtfProc) {
 	flags |= ENCODING_INPUT;
@@ -1382,7 +1485,8 @@ Tcl_UtfToExternalDString(
     Tcl_DString *dstPtr)	/* Uninitialized or free DString in which the
 				 * converted string is stored. */
 {
-    Tcl_UtfToExternalDStringEx(encoding, src, srcLen, TCL_ENCODING_NOCOMPLAIN, dstPtr);
+    Tcl_UtfToExternalDStringEx(
+	NULL, encoding, src, srcLen, TCL_ENCODING_PROFILE_TCL8, dstPtr, NULL);
     return Tcl_DStringValue(dstPtr);
 }
 
@@ -1395,45 +1499,73 @@ Tcl_UtfToExternalDString(
  *	Convert a source buffer from UTF-8 to the specified encoding.
  *	The parameter flags controls the behavior, if any of the bytes in
  *	the source buffer are invalid or cannot be represented in the
- *	target encoding.
- *	Possible flags values:
- *	TCL_ENCODING_NOCOMPLAIN: replace invalid characters/bytes by a default
- *	fallback character. Always return -1 (Default in Tcl 8.7).
- *	TCL_ENCODING_MODIFIED: convert NULL bytes to \xC0\x80 in stead of 0x00.
- *	Only valid for "utf-8" and "cesu-8". This flag may be used together
- *	with the other flags.
+ *	target encoding. It should be composed by OR-ing the following:
+ *	- *At most one* of TCL_ENCODING_PROFILE{DEFAULT,TCL8,STRICT}
+ *	- TCL_ENCODING_STOPONERROR: Backward compatibility. Sets the profile
+ *	  to TCL_ENCODING_PROFILE_STRICT overriding any specified profile flags
  *
  * Results:
- *	The converted bytes are stored in the DString, which is then NULL
- *	terminated in an encoding-specific manner. The return value is
- *	the error position in the source string or -1 if no conversion error
- *	is reported.
+ *      The return value is one of
+ *        TCL_OK: success. Converted string in *dstPtr
+ *        TCL_ERROR: error in passed parameters. Error message in interp
+ *        TCL_CONVERT_MULTIBYTE: source ends in truncated multibyte sequence
+ *        TCL_CONVERT_SYNTAX: source is not conformant to encoding definition
+ *        TCL_CONVERT_UNKNOWN: source contained a character that could not
+ *            be represented in target encoding.
  *
  * Side effects:
- *	None.
+ *
+ *      TCL_OK: The converted bytes are stored in the DString and NUL
+ *          terminated in an encoding-specific manner
+ *      TCL_ERROR: an error, message is stored in the interp if not NULL.
+ *      TCL_CONVERT_*: if errorLocPtr is NULL, an error message is stored
+ *          in the interpreter (if not NULL). If errorLocPtr is not NULL,
+ *          no error message is stored as it is expected the caller is
+ *          interested in whatever is decoded so far and not treating this
+ *          as an error condition.
+ *
+ *      In addition, *dstPtr is always initialized and must be cleared
+ *      by the caller irrespective of the return code.
  *
  *-------------------------------------------------------------------------
  */
 
-Tcl_Size
+int
 Tcl_UtfToExternalDStringEx(
+    Tcl_Interp *interp,         /* For error messages. May be NULL. */
     Tcl_Encoding encoding,	/* The encoding for the converted string, or
 				 * NULL for the default system encoding. */
     const char *src,		/* Source string in UTF-8. */
     Tcl_Size srcLen,		/* Source string length in bytes, or < 0 for
 				 * strlen(). */
     int flags,			/* Conversion control flags. */
-    Tcl_DString *dstPtr)	/* Uninitialized or free DString in which the
+    Tcl_DString *dstPtr,	/* Uninitialized or free DString in which the
 				 * converted string is stored. */
+    Tcl_Size *errorLocPtr)      /* Where to store the error location
+                                   (or TCL_INDEX_NONE if no error). May
+				   be NULL. */
 {
     char *dst;
     Tcl_EncodingState state;
     const Encoding *encodingPtr;
     int result;
-    Tcl_Size dstLen, soFar;
     const char *srcStart = src;
+    Tcl_Size dstLen, soFar;
 
+    /* DO FIRST - must always be initialized on return */
     Tcl_DStringInit(dstPtr);
+
+    if (flags & (TCL_ENCODING_START|TCL_ENCODING_END)) {
+	/* TODO - what other flags are illegal? - See TIP 656 */
+	Tcl_SetObjResult(
+	    interp,
+	    Tcl_NewStringObj(
+		"Parameter error: TCL_ENCODING_{START,STOP} bits set in flags.",
+		TCL_INDEX_NONE));
+	Tcl_SetErrorCode(interp, "TCL", "ENCODING", "ILLEGALFLAGS", NULL);
+	return TCL_ERROR;
+    }
+
     dst = Tcl_DStringValue(dstPtr);
     dstLen = dstPtr->spaceAvl - 1;
 
@@ -1447,6 +1579,7 @@ Tcl_UtfToExternalDStringEx(
     } else if (srcLen == TCL_INDEX_NONE) {
 	srcLen = strlen(src);
     }
+
     flags |= TCL_ENCODING_START;
     while (1) {
 	int srcChunkLen, srcChunkRead;
@@ -1461,8 +1594,8 @@ Tcl_UtfToExternalDStringEx(
 	dstChunkLen = dstLen > INT_MAX ? INT_MAX : dstLen;
 
 	result = encodingPtr->fromUtfProc(encodingPtr->clientData, src,
-		srcChunkLen, flags, &state, dst, dstChunkLen,
-		&srcChunkRead, &dstChunkWrote, &dstChunkChars);
+					  srcChunkLen, flags, &state, dst, dstChunkLen,
+					  &srcChunkRead, &dstChunkWrote, &dstChunkChars);
 	soFar = dst + dstChunkWrote - Tcl_DStringValue(dstPtr);
 
 	/* Move past the part processed in this go around */
@@ -1478,12 +1611,38 @@ Tcl_UtfToExternalDStringEx(
 	 */
 	if ((result != TCL_CONVERT_NOSPACE) &&
 	    !(result == TCL_CONVERT_MULTIBYTE && (flags & TCL_ENCODING_END))) {
+	    Tcl_Size nBytesProcessed = (src - srcStart);
 	    size_t i = soFar + encodingPtr->nullSize - 1;
 	    /* Loop as DStringSetLength only stores one nul byte at a time */
 	    while (i+1 >= soFar+1) {
 		Tcl_DStringSetLength(dstPtr, i--);
 	    }
-	    return (result == TCL_OK) ? TCL_INDEX_NONE : (Tcl_Size)(src - srcStart);
+	    if (errorLocPtr) {
+		/*
+		 * Do not write error message into interpreter if caller
+		 * wants to know error location.
+		 */
+		*errorLocPtr = result == TCL_OK ? TCL_INDEX_NONE : nBytesProcessed;
+	    } else {
+		/* Caller wants error message on failure */
+		if (result != TCL_OK && interp != NULL) {
+		    Tcl_Size pos = Tcl_NumUtfChars(srcStart, nBytesProcessed);
+		    int ucs4;
+		    char buf[TCL_INTEGER_SPACE];
+		    TclUtfToUCS4(&srcStart[nBytesProcessed], &ucs4);
+		    snprintf(buf, sizeof(buf), "%" TCL_Z_MODIFIER "u", nBytesProcessed);
+		    Tcl_SetObjResult(
+			interp,
+			Tcl_ObjPrintf(
+			    "unexpected character at index %" TCL_Z_MODIFIER
+			    "u: 'U+%06X'",
+			    pos,
+			    ucs4));
+		    Tcl_SetErrorCode(interp, "TCL", "ENCODING", "ILLEGALSEQUENCE",
+				     buf, NULL);
+		}
+	    }
+	    return result;
 	}
 
 	flags &= ~TCL_ENCODING_START;
@@ -1581,10 +1740,17 @@ Tcl_UtfToExternal(
 	dstCharsPtr = &dstChars;
     }
 
+    if (dstLen < encodingPtr->nullSize) {
+	return TCL_CONVERT_NOSPACE;
+    }
     dstLen -= encodingPtr->nullSize;
     result = encodingPtr->fromUtfProc(encodingPtr->clientData, src, srcLen,
 	    flags, statePtr, dst, dstLen, srcReadPtr,
 	    dstWrotePtr, dstCharsPtr);
+    /*
+     * Buffer is terminated irrespective of result. Not sure this is
+     * reasonable but keep for historical/compatibility reasons.
+     */
     memset(&dst[*dstWrotePtr], '\0', encodingPtr->nullSize);
 
     return result;
@@ -1644,7 +1810,7 @@ OpenEncodingFileChannel(
     const char *name)		/* The name of the encoding file on disk and
 				 * also the name for new encoding. */
 {
-    Tcl_Obj *nameObj = Tcl_NewStringObj(name, -1);
+    Tcl_Obj *nameObj = Tcl_NewStringObj(name, TCL_INDEX_NONE);
     Tcl_Obj *fileNameObj = Tcl_DuplicateObj(nameObj);
     Tcl_Obj *searchPath = Tcl_DuplicateObj(Tcl_GetEncodingSearchPath());
     Tcl_Obj *map = TclGetProcessGlobalValue(&encodingFileMap);
@@ -1654,7 +1820,7 @@ OpenEncodingFileChannel(
 
     TclListObjGetElementsM(NULL, searchPath, &numDirs, &dir);
     Tcl_IncrRefCount(nameObj);
-    Tcl_AppendToObj(fileNameObj, ".enc", -1);
+    Tcl_AppendToObj(fileNameObj, ".enc", TCL_INDEX_NONE);
     Tcl_IncrRefCount(fileNameObj);
     Tcl_DictObjGet(NULL, map, nameObj, &directory);
 
@@ -2286,6 +2452,7 @@ BinaryProc(
     if (dstLen < 0) {
 	dstLen = 0;
     }
+    flags = TclEncodingSetProfileFlags(flags);
     if ((flags & TCL_ENCODING_CHAR_LIMIT) && srcLen > *dstCharsPtr) {
 	srcLen = *dstCharsPtr;
     }
@@ -2319,14 +2486,12 @@ BinaryProc(
  *-------------------------------------------------------------------------
  */
 
-#define STOPONERROR (!(flags & TCL_ENCODING_NOCOMPLAIN))
-
 static int
 UtfToUtfProc(
-    void *clientData,	/* additional flags, e.g. TCL_ENCODING_MODIFIED */
+    void *clientData,		/* additional flags */
     const char *src,		/* Source string in UTF-8. */
     int srcLen,			/* Source string length in bytes. */
-    int flags,			/* Conversion control flags. */
+    int flags,			/* TCL_ENCODING_* conversion control flags. */
     TCL_UNUSED(Tcl_EncodingState *),
     char *dst,			/* Output buffer in which converted string is
 				 * stored. */
@@ -2348,12 +2513,14 @@ UtfToUtfProc(
     const char *dstStart, *dstEnd;
     int result, numChars, charLimit = INT_MAX;
     int ch;
+    int profile;
 
     result = TCL_OK;
 
     srcStart = src;
     srcEnd = src + srcLen;
     srcClose = srcEnd;
+    flags = TclEncodingSetProfileFlags(flags);
     if ((flags & TCL_ENCODING_END) == 0) {
 	srcClose -= 6;
     }
@@ -2365,7 +2532,9 @@ UtfToUtfProc(
     flags |= PTR2INT(clientData);
     dstEnd = dst + dstLen - ((flags & ENCODING_UTF) ? TCL_UTF_MAX : 6);
 
+    profile = CHANNEL_PROFILE_GET(flags);
     for (numChars = 0; src < srcEnd && numChars <= charLimit; numChars++) {
+
 	if ((src > srcClose) && (!Tcl_UtfCharComplete(src, srcEnd - src))) {
 	    /*
 	     * If there is more string to follow, this will ensure that the
@@ -2382,29 +2551,35 @@ UtfToUtfProc(
 	if (UCHAR(*src) < 0x80 && !((UCHAR(*src) == 0) && (flags & ENCODING_INPUT))) {
 	    /*
 	     * Copy 7bit characters, but skip null-bytes when we are in input
-	     * mode, so that they get converted to 0xC080.
+	     * mode, so that they get converted to \xC0\x80.
 	     */
-
 	    *dst++ = *src++;
-	} else if ((UCHAR(*src) == 0xC0) && (src + 1 < srcEnd)
-		&& (UCHAR(src[1]) == 0x80) && !(flags & TCL_ENCODING_MODIFIED) && (!(flags & ENCODING_INPUT)
-			|| ((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT)
-			|| (flags & ENCODING_FAILINDEX))) {
-	    /*
-	     * If in input mode, and -strict or -failindex is specified: This is an error.
-	     */
-	    if ((STOPONERROR) && (flags & ENCODING_INPUT)) {
-		result = TCL_CONVERT_SYNTAX;
-		break;
+	} else if ((UCHAR(*src) == 0xC0) && (src + 1 < srcEnd) &&
+		 (UCHAR(src[1]) == 0x80) &&
+		 (!(flags & ENCODING_INPUT) || PROFILE_STRICT(profile) ||
+		  PROFILE_REPLACE(profile))) {
+	    /* Special sequence \xC0\x80 */
+	    if ((PROFILE_STRICT(profile) || PROFILE_REPLACE(profile)) && (flags & ENCODING_INPUT)) {
+		if (PROFILE_REPLACE(profile)) {
+		   dst += Tcl_UniCharToUtf(UNICODE_REPLACE_CHAR, dst);
+		   src += 2;
+		} else {
+		   /* PROFILE_STRICT */
+		   result = TCL_CONVERT_SYNTAX;
+		   break;
+		}
+	    } else {
+		/*
+		 * Convert 0xC080 to real nulls when we are in output mode,
+		 * irrespective of the profile.
+		 */
+		*dst++ = 0;
+		src += 2;
 	    }
 
-	    /*
-	     * Convert 0xC080 to real nulls when we are in output mode, with or without '-strict'.
-	     */
-	    *dst++ = 0;
-	    src += 2;
 	} else if (!Tcl_UtfCharComplete(src, srcEnd - src)) {
 	    /*
+	     * Incomplete byte sequence.
 	     * Always check before using TclUtfToUCS4. Not doing can so
 	     * cause it run beyond the end of the buffer! If we happen such an
 	     * incomplete char its bytes are made to represent themselves
@@ -2412,32 +2587,43 @@ UtfToUtfProc(
 	     */
 
 	    if (flags & ENCODING_INPUT) {
-		if ((STOPONERROR) && (flags & TCL_ENCODING_CHAR_LIMIT)) {
-		    result = TCL_CONVERT_MULTIBYTE;
-		    break;
-		}
-		if (((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT) || (flags & ENCODING_FAILINDEX)) {
-		    result = TCL_CONVERT_SYNTAX;
+		/* Incomplete bytes for modified UTF-8 target */
+		if (PROFILE_STRICT(profile)) {
+		    result = (flags & TCL_ENCODING_CHAR_LIMIT)
+			       ? TCL_CONVERT_MULTIBYTE
+			       : TCL_CONVERT_SYNTAX;
 		    break;
 		}
 	    }
-	    char chbuf[2];
-	    chbuf[0] = UCHAR(*src++); chbuf[1] = 0;
-	    TclUtfToUCS4(chbuf, &ch);
+	    if (PROFILE_REPLACE(profile)) {
+		ch = UNICODE_REPLACE_CHAR;
+		++src;
+	    } else {
+		/* TCL_ENCODING_PROFILE_TCL8 */
+		char chbuf[2];
+		chbuf[0] = UCHAR(*src++); chbuf[1] = 0;
+		TclUtfToUCS4(chbuf, &ch);
+	    }
 	    dst += Tcl_UniCharToUtf(ch, dst);
 	} else {
+	    int isInvalid = 0;
 	    size_t len = TclUtfToUCS4(src, &ch);
 	    if (flags & ENCODING_INPUT) {
-		if ((len < 2) && (ch != 0)
-			&& (((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT) || (flags & ENCODING_FAILINDEX))) {
-		    goto utf8Syntax;
-		} else if ((ch > 0xFFFF) && !(flags & ENCODING_UTF)
-			&& (((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT) || (flags & ENCODING_FAILINDEX))) {
-		utf8Syntax:
-		    result = TCL_CONVERT_SYNTAX;
-		    break;
+		if ((len < 2) && (ch != 0)) {
+		    isInvalid = 1;
+		} else if ((ch > 0xFFFF) && !(flags & ENCODING_UTF)) {
+		    isInvalid = 1;
+		}
+		if (isInvalid) {
+		    if (PROFILE_STRICT(profile)) {
+			result = TCL_CONVERT_SYNTAX;
+			break;
+		    } else if (PROFILE_REPLACE(profile)) {
+			ch = UNICODE_REPLACE_CHAR;
+		    }
 		}
 	    }
+
 	    const char *saveSrc = src;
 	    src += len;
 	    if (!(flags & ENCODING_UTF) && !(flags & ENCODING_INPUT) && (ch > 0x3FF)) {
@@ -2457,38 +2643,45 @@ UtfToUtfProc(
 		*dst++ = (char) ((ch | 0x80) & 0xBF);
 		continue;
 #if TCL_UTF_MAX < 4
-	    } else if ((ch | 0x7FF) == 0xDFFF) {
+	    } else if (SURROGATE(ch)) {
 		/*
 		 * A surrogate character is detected, handle especially.
 		 */
-
-		if (((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT) && (flags & ENCODING_UTF)) {
+		if (PROFILE_STRICT(profile) && (flags & ENCODING_UTF)) {
 		    result = TCL_CONVERT_UNKNOWN;
 		    src = saveSrc;
 		    break;
 		}
-		int low = ch;
-		len = (src <= srcEnd-3) ? TclUtfToUCS4(src, &low) : 0;
-
-		if (((low & ~0x3FF) != 0xDC00) || (ch & 0x400)) {
-
-		    if (STOPONERROR) {
-			result = TCL_CONVERT_UNKNOWN;
-			src = saveSrc;
-			break;
+		if (PROFILE_REPLACE(profile)) {
+		    /* TODO - is this right for cesu8 or should we fall through below? */
+		    ch = UNICODE_REPLACE_CHAR;
+		} else {
+		    int low = ch;
+		    len = (src <= srcEnd - 3) ? TclUtfToUCS4(src, &low) : 0;
+
+		    if ((!LOW_SURROGATE(low)) || (ch & 0x400)) {
+
+			if (PROFILE_STRICT(profile)) {
+			    result = TCL_CONVERT_UNKNOWN;
+			    src = saveSrc;
+			    break;
+			}
+			goto cesu8;
 		    }
-		    goto cesu8;
+		    src += len;
+		    dst += Tcl_UniCharToUtf(ch, dst);
+		    ch = low;
 		}
-		src += len;
-		dst += Tcl_UniCharToUtf(ch, dst);
-		ch = low;
 #endif
-	    } else if (STOPONERROR && !(flags & ENCODING_INPUT) && (((ch  & ~0x7FF) == 0xD800))) {
+	    } else if (PROFILE_STRICT(profile) &&
+		       (!(flags & ENCODING_INPUT)) &&
+		       SURROGATE(ch)) {
 		result = TCL_CONVERT_UNKNOWN;
 		src = saveSrc;
 		break;
-	    } else if (((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT)
-		    && (flags & ENCODING_INPUT) && ((ch  & ~0x7FF) == 0xD800)) {
+	    } else if (PROFILE_STRICT(profile) &&
+		       (flags & ENCODING_INPUT) &&
+		       SURROGATE(ch)) {
 		result = TCL_CONVERT_SYNTAX;
 		src = saveSrc;
 		break;
@@ -2545,8 +2738,9 @@ Utf32ToUtfProc(
     const char *srcStart, *srcEnd;
     const char *dstEnd, *dstStart;
     int result, numChars, charLimit = INT_MAX;
-    int ch, bytesLeft = srcLen % 4;
+    int ch = 0, bytesLeft = srcLen % 4;
 
+    flags = TclEncodingSetProfileFlags(flags);
     flags |= PTR2INT(clientData);
     if (flags & TCL_ENCODING_CHAR_LIMIT) {
 	charLimit = *dstCharsPtr;
@@ -2556,12 +2750,27 @@ Utf32ToUtfProc(
     /*
      * Check alignment with utf-32 (4 == sizeof(UTF-32))
      */
-
     if (bytesLeft != 0) {
+	/* We have a truncated code unit */
 	result = TCL_CONVERT_MULTIBYTE;
 	srcLen -= bytesLeft;
     }
 
+#if TCL_UTF_MAX < 4
+    /*
+     * If last code point is a high surrogate, we cannot handle that yet,
+     * unless we are at the end.
+     */
+
+    if (!(flags & TCL_ENCODING_END) && (srcLen >= 4) &&
+	    ((src[srcLen - ((flags & TCL_ENCODING_LE)?3:2)] & 0xFC) == 0xD8) &&
+	    ((src[srcLen - ((flags & TCL_ENCODING_LE)?2:3)]) == 0) &&
+	    ((src[srcLen - ((flags & TCL_ENCODING_LE)?1:4)]) == 0)) {
+	result = TCL_CONVERT_MULTIBYTE;
+	srcLen-= 4;
+    }
+#endif
+
     srcStart = src;
     srcEnd = src + srcLen;
 
@@ -2574,23 +2783,35 @@ Utf32ToUtfProc(
 	    break;
 	}
 
+#if TCL_UTF_MAX < 4
+	int prev = ch;
+#endif
 	if (flags & TCL_ENCODING_LE) {
 	    ch = (src[3] & 0xFF) << 24 | (src[2] & 0xFF) << 16 | (src[1] & 0xFF) << 8 | (src[0] & 0xFF);
 	} else {
 	    ch = (src[0] & 0xFF) << 24 | (src[1] & 0xFF) << 16 | (src[2] & 0xFF) << 8 | (src[3] & 0xFF);
 	}
-	if  ((unsigned)ch > 0x10FFFF) {
-	    if (STOPONERROR) {
-		result = TCL_CONVERT_SYNTAX;
-		break;
-	    }
-	    ch = 0xFFFD;
-	} else if (((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT)
-		&& ((ch  & ~0x7FF) == 0xD800)) {
-	    if (STOPONERROR) {
+#if TCL_UTF_MAX < 4
+	if (HIGH_SURROGATE(prev) && !LOW_SURROGATE(ch)) {
+	    /* Bug [10c2c17c32]. If Hi surrogate not followed by Lo surrogate, finish 3-byte UTF-8 */
+	    dst += Tcl_UniCharToUtf(-1, dst);
+	}
+#endif
+
+	if ((unsigned)ch > 0x10FFFF) {
+	    ch = UNICODE_REPLACE_CHAR;
+	    if (PROFILE_STRICT(flags)) {
 		result = TCL_CONVERT_SYNTAX;
 		break;
 	    }
+	} else if (PROFILE_STRICT(flags) && SURROGATE(ch)) {
+	    result = TCL_CONVERT_SYNTAX;
+#if TCL_UTF_MAX < 4
+	    ch = 0;
+#endif
+	    break;
+	} else if (PROFILE_REPLACE(flags) && SURROGATE(ch)) {
+	    ch = UNICODE_REPLACE_CHAR;
 	}
 
 	/*
@@ -2598,30 +2819,41 @@ Utf32ToUtfProc(
 	 * unsigned short-size data.
 	 */
 
-	if ((ch > 0) && (ch < 0x80)) {
+	if ((unsigned)ch - 1 < 0x7F) {
 	    *dst++ = (ch & 0xFF);
 	} else {
 	    dst += Tcl_UniCharToUtf(ch, dst);
 	}
-	src += sizeof(unsigned int);
+	src += 4;
+    }
+
+    /*
+     * If we had a truncated code unit at the end AND this is the last
+     * fragment AND profile is not "strict", stick FFFD in its place.
+     */
+#if TCL_UTF_MAX < 4
+    if (HIGH_SURROGATE(ch)) {
+	/* Bug [10c2c17c32]. If Hi surrogate, finish 3-byte UTF-8 */
+	dst += Tcl_UniCharToUtf(-1, dst);
     }
+#endif
 
     if ((flags & TCL_ENCODING_END) && (result == TCL_CONVERT_MULTIBYTE)) {
-	/* We have a single byte left-over at the end */
 	if (dst > dstEnd) {
 	    result = TCL_CONVERT_NOSPACE;
 	} else {
-	    /* destination is not full, so we really are at the end now */
-	    if ((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT) {
+	    if (PROFILE_STRICT(flags)) {
 		result = TCL_CONVERT_SYNTAX;
 	    } else {
+		/* PROFILE_REPLACE or PROFILE_TCL8 */
 		result = TCL_OK;
-		dst += Tcl_UniCharToUtf(0xFFFD, dst);
+		dst += Tcl_UniCharToUtf(UNICODE_REPLACE_CHAR, dst);
 		numChars++;
-		src += bytesLeft;
+		src += bytesLeft; /* Go past truncated code unit */
 	    }
 	}
     }
+
     *srcReadPtr = src - srcStart;
     *dstWrotePtr = dst - dstStart;
     *dstCharsPtr = numChars;
@@ -2674,6 +2906,7 @@ UtfToUtf32Proc(
     srcStart = src;
     srcEnd = src + srcLen;
     srcClose = srcEnd;
+    flags = TclEncodingSetProfileFlags(flags);
     if ((flags & TCL_ENCODING_END) == 0) {
 	srcClose -= TCL_UTF_MAX;
     }
@@ -2698,11 +2931,14 @@ UtfToUtf32Proc(
 	    break;
 	}
 	len = TclUtfToUCS4(src, &ch);
-	if ((ch  & ~0x7FF) == 0xD800) {
-	    if (STOPONERROR) {
+	if (SURROGATE(ch)) {
+	    if (PROFILE_STRICT(flags)) {
 		result = TCL_CONVERT_UNKNOWN;
 		break;
 	    }
+	    if (PROFILE_REPLACE(flags)) {
+		ch = UNICODE_REPLACE_CHAR;
+	    }
 	}
 	src += len;
 	if (flags & TCL_ENCODING_LE) {
@@ -2768,6 +3004,7 @@ Utf16ToUtfProc(
     int result, numChars, charLimit = INT_MAX;
     unsigned short ch = 0;
 
+    flags = TclEncodingSetProfileFlags(flags);
     flags |= PTR2INT(clientData);
     if (flags & TCL_ENCODING_CHAR_LIMIT) {
 	charLimit = *dstCharsPtr;
@@ -2800,7 +3037,7 @@ Utf16ToUtfProc(
     dstStart = dst;
     dstEnd = dst + dstLen - TCL_UTF_MAX;
 
-    for (numChars = 0; src < srcEnd && numChars <= charLimit; numChars++) {
+    for (numChars = 0; src < srcEnd && numChars <= charLimit; src += 2, numChars++) {
 	if (dst > dstEnd) {
 	    result = TCL_CONVERT_NOSPACE;
 	    break;
@@ -2812,9 +3049,30 @@ Utf16ToUtfProc(
 	} else {
 	    ch = (src[0] & 0xFF) << 8 | (src[1] & 0xFF);
 	}
-	if (((prev  & ~0x3FF) == 0xD800) && ((ch  & ~0x3FF) != 0xDC00)) {
+	if (HIGH_SURROGATE(prev) && !LOW_SURROGATE(ch)) {
+	    if (PROFILE_STRICT(flags)) {
+		result = TCL_CONVERT_SYNTAX;
+		src -= 2; /* Go back to beginning of high surrogate */
+		dst--; /* Also undo writing a single byte too much */
+		numChars--;
+		break;
+	    } else if (PROFILE_REPLACE(flags)) {
+		/*
+		 * Previous loop wrote a single byte to mark the high surrogate.
+		 * Replace it with the replacement character. Further, restart
+		 * current loop iteration since need to recheck destination space
+		 * and reset processing of current character.
+		 */
+		ch = UNICODE_REPLACE_CHAR;
+		dst--;
+		dst += Tcl_UniCharToUtf(ch, dst);
+		src -= 2;
+		numChars--;
+		continue;
+	    } else {
 	    /* Bug [10c2c17c32]. If Hi surrogate not followed by Lo surrogate, finish 3-byte UTF-8 */
-	    dst += Tcl_UniCharToUtf(-1, dst);
+		dst += Tcl_UniCharToUtf(-1, dst);
+	    }
 	}
 
 	/*
@@ -2822,34 +3080,59 @@ Utf16ToUtfProc(
 	 * unsigned short-size data.
 	 */
 
-	if (ch && ch < 0x80) {
+	if ((unsigned)ch - 1 < 0x7F) {
 	    *dst++ = (ch & 0xFF);
-	} else {
+	} else if (HIGH_SURROGATE(prev) || HIGH_SURROGATE(ch)) {
 	    dst += Tcl_UniCharToUtf(ch | TCL_COMBINE, dst);
+	} else if (LOW_SURROGATE(ch) && !PROFILE_TCL8(flags)) {
+	    /* Lo surrogate not preceded by Hi surrogate and not tcl8 profile */
+	    if (PROFILE_STRICT(flags)) {
+		result = TCL_CONVERT_UNKNOWN;
+		break;
+	    } else {
+		/* PROFILE_REPLACE */
+		dst += Tcl_UniCharToUtf(UNICODE_REPLACE_CHAR, dst);
+	    }
+	} else {
+	    dst += Tcl_UniCharToUtf(ch, dst);
 	}
-	src += sizeof(unsigned short);
     }
 
-    if ((ch  & ~0x3FF) == 0xD800) {
-	/* Bug [10c2c17c32]. If Hi surrogate, finish 3-byte UTF-8 */
-	dst += Tcl_UniCharToUtf(-1, dst);
+    if (HIGH_SURROGATE(ch)) {
+	if (PROFILE_STRICT(flags)) {
+	    result = TCL_CONVERT_SYNTAX;
+	    src -= 2;
+	    dst--;
+	    numChars--;
+	} else if (PROFILE_REPLACE(flags)) {
+	    dst--;
+	    dst += Tcl_UniCharToUtf(UNICODE_REPLACE_CHAR, dst);
+	} else {
+	    /* Bug [10c2c17c32]. If Hi surrogate, finish 3-byte UTF-8 */
+	    dst += Tcl_UniCharToUtf(-1, dst);
+	}
     }
+
+    /*
+     * If we had a truncated code unit at the end AND this is the last
+     * fragment AND profile is not "strict", stick FFFD in its place.
+     */
     if ((flags & TCL_ENCODING_END) && (result == TCL_CONVERT_MULTIBYTE)) {
-	/* We have a single byte left-over at the end */
 	if (dst > dstEnd) {
 	    result = TCL_CONVERT_NOSPACE;
 	} else {
-	    /* destination is not full, so we really are at the end now */
-	    if (((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT)) {
+	    if (PROFILE_STRICT(flags)) {
 		result = TCL_CONVERT_SYNTAX;
 	    } else {
+		/* PROFILE_REPLACE or PROFILE_TCL8 */
 		result = TCL_OK;
-		dst += Tcl_UniCharToUtf(0xFFFD, dst);
+		dst += Tcl_UniCharToUtf(UNICODE_REPLACE_CHAR, dst);
 		numChars++;
-		src++;
+		src++; /* Go past truncated code unit */
 	    }
 	}
     }
+
     *srcReadPtr = src - srcStart;
     *dstWrotePtr = dst - dstStart;
     *dstCharsPtr = numChars;
@@ -2902,6 +3185,7 @@ UtfToUtf16Proc(
     srcStart = src;
     srcEnd = src + srcLen;
     srcClose = srcEnd;
+    flags = TclEncodingSetProfileFlags(flags);
     if ((flags & TCL_ENCODING_END) == 0) {
 	srcClose -= TCL_UTF_MAX;
     }
@@ -2926,11 +3210,14 @@ UtfToUtf16Proc(
 	    break;
 	}
 	len = TclUtfToUCS4(src, &ch);
-	if ((ch  & ~0x7FF) == 0xD800) {
-	    if (STOPONERROR) {
+	if (SURROGATE(ch)) {
+	    if (PROFILE_STRICT(flags)) {
 		result = TCL_CONVERT_UNKNOWN;
 		break;
 	    }
+	    if (PROFILE_REPLACE(flags)) {
+		ch = UNICODE_REPLACE_CHAR;
+	    }
 	}
 	src += len;
 	if (flags & TCL_ENCODING_LE) {
@@ -3004,6 +3291,7 @@ UtfToUcs2Proc(
     int result, numChars, len;
     Tcl_UniChar ch = 0;
 
+    flags = TclEncodingSetProfileFlags(flags);
     flags |= PTR2INT(clientData);
     srcStart = src;
     srcEnd = src + srcLen;
@@ -3033,25 +3321,25 @@ UtfToUcs2Proc(
 #if TCL_UTF_MAX < 4
 	len = TclUtfToUniChar(src, &ch);
 	if ((ch >= 0xD800) && (len < 3)) {
-	    if (STOPONERROR) {
+	    if (PROFILE_STRICT(flags)) {
 		result = TCL_CONVERT_UNKNOWN;
 		break;
 	    }
 	    src += len;
 	    src += TclUtfToUniChar(src, &ch);
-	    ch = 0xFFFD;
+	    ch = UNICODE_REPLACE_CHAR;
 	}
 #else
 	len = TclUtfToUniChar(src, &ch);
 	if (ch > 0xFFFF) {
-	    if (STOPONERROR) {
+	    if (PROFILE_STRICT(flags)) {
 		result = TCL_CONVERT_UNKNOWN;
 		break;
 	    }
-	    ch = 0xFFFD;
+	    ch = UNICODE_REPLACE_CHAR;
 	}
 #endif
-	if (STOPONERROR && ((ch & ~0x7FF) == 0xD800)) {
+	if (PROFILE_STRICT(flags) && SURROGATE(ch)) {
 	    result = TCL_CONVERT_SYNTAX;
 	    break;
 	}
@@ -3126,6 +3414,7 @@ TableToUtfProc(
     const unsigned short *pageZero;
     TableEncodingData *dataPtr = (TableEncodingData *)clientData;
 
+    flags = TclEncodingSetProfileFlags(flags);
     if (flags & TCL_ENCODING_CHAR_LIMIT) {
 	charLimit = *dstCharsPtr;
     }
@@ -3149,31 +3438,47 @@ TableToUtfProc(
 	if (prefixBytes[byte]) {
 	    src++;
 	    if (src >= srcEnd) {
-		src--;
-		result = TCL_CONVERT_MULTIBYTE;
-		break;
+		if (!(flags & TCL_ENCODING_END)) {
+		    src--;
+		    result = TCL_CONVERT_MULTIBYTE;
+		    break;
+		} else if (PROFILE_STRICT(flags)) {
+		    src--;
+		    result = TCL_CONVERT_SYNTAX;
+		    break;
+		} else if (PROFILE_REPLACE(flags)) {
+		    ch = UNICODE_REPLACE_CHAR;
+		} else {
+		    src--; /* See bug [bdcb5126c0] */
+		    result = TCL_CONVERT_MULTIBYTE;
+		    break;
+		}
+	    } else {
+		ch = toUnicode[byte][*((unsigned char *)src)];
 	    }
-	    ch = toUnicode[byte][*((unsigned char *) src)];
 	} else {
 	    ch = pageZero[byte];
 	}
 	if ((ch == 0) && (byte != 0)) {
-	    if ((flags & ENCODING_FAILINDEX)
-		    || ((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT)) {
+	    if (PROFILE_STRICT(flags)) {
 		result = TCL_CONVERT_SYNTAX;
 		break;
 	    }
 	    if (prefixBytes[byte]) {
 		src--;
 	    }
-	    ch = (Tcl_UniChar) byte;
+	    if (PROFILE_REPLACE(flags)) {
+		ch = UNICODE_REPLACE_CHAR;
+	    } else {
+		ch = (Tcl_UniChar)byte;
+	    }
 	}
 
 	/*
 	 * Special case for 1-byte utf chars for speed.
 	 */
 
-	if (ch && ch < 0x80) {
+	if ((unsigned)ch - 1 < 0x7F) {
 	    *dst++ = (char) ch;
 	} else {
 	    dst += Tcl_UniCharToUtf(ch, dst);
@@ -3243,6 +3548,7 @@ TableFromUtfProc(
     srcStart = src;
     srcEnd = src + srcLen;
     srcClose = srcEnd;
+    flags = TclEncodingSetProfileFlags(flags);
     if ((flags & TCL_ENCODING_END) == 0) {
 	srcClose -= TCL_UTF_MAX;
     }
@@ -3275,11 +3581,11 @@ TableFromUtfProc(
 	    word = fromUnicode[(ch >> 8)][ch & 0xFF];
 
 	if ((word == 0) && (ch != 0)) {
-	    if (STOPONERROR) {
+	    if (PROFILE_STRICT(flags)) {
 		result = TCL_CONVERT_UNKNOWN;
 		break;
 	    }
-	    word = dataPtr->fallback;
+	    word = dataPtr->fallback; /* Both profiles REPLACE and TCL8 */
 	}
 	if (prefixBytes[(word >> 8)] != 0) {
 	    if (dst + 1 > dstEnd) {
@@ -3349,6 +3655,7 @@ Iso88591ToUtfProc(
     const char *dstEnd, *dstStart;
     int result, numChars, charLimit = INT_MAX;
 
+    flags = TclEncodingSetProfileFlags(flags);
     if (flags & TCL_ENCODING_CHAR_LIMIT) {
 	charLimit = *dstCharsPtr;
     }
@@ -3372,7 +3679,7 @@ Iso88591ToUtfProc(
 	 * Special case for 1-byte utf chars for speed.
 	 */
 
-	if (ch && ch < 0x80) {
+	if ((unsigned)ch - 1 < 0x7F) {
 	    *dst++ = (char) ch;
 	} else {
 	    dst += Tcl_UniCharToUtf(ch, dst);
@@ -3433,6 +3740,7 @@ Iso88591FromUtfProc(
     srcStart = src;
     srcEnd = src + srcLen;
     srcClose = srcEnd;
+    flags = TclEncodingSetProfileFlags(flags);
     if ((flags & TCL_ENCODING_END) == 0) {
 	srcClose -= TCL_UTF_MAX;
     }
@@ -3463,7 +3771,7 @@ Iso88591FromUtfProc(
 		|| ((ch >= 0xD800) && (len < 3))
 #endif
 		) {
-	    if (STOPONERROR) {
+	    if (PROFILE_STRICT(flags)) {
 		result = TCL_CONVERT_UNKNOWN;
 		break;
 	    }
@@ -3476,7 +3784,7 @@ Iso88591FromUtfProc(
 	     * Plunge on, using '?' as a fallback character.
 	     */
 
-	    ch = (Tcl_UniChar) '?';
+	    ch = (Tcl_UniChar) '?'; /* Profiles TCL8 and REPLACE */
 	}
 
 	if (dst > dstEnd) {
@@ -3580,6 +3888,7 @@ EscapeToUtfProc(
     int state, result, numChars, charLimit = INT_MAX;
     const char *dstStart, *dstEnd;
 
+    flags = TclEncodingSetProfileFlags(flags);
     if (flags & TCL_ENCODING_CHAR_LIMIT) {
 	charLimit = *dstCharsPtr;
     }
@@ -3690,9 +3999,10 @@ EscapeToUtfProc(
 
 	    if ((checked == dataPtr->numSubTables + 2)
 		    || (flags & TCL_ENCODING_END)) {
-		if (!STOPONERROR) {
+		if (!PROFILE_STRICT(flags)) {
 		    /*
-		     * Skip the unknown escape sequence.
+		     * Skip the unknown escape sequence. TODO - bug?
+		     * May be replace with UNICODE_REPLACE_CHAR?
 		     */
 
 		    src += longest;
@@ -3802,6 +4112,7 @@ EscapeFromUtfProc(
     srcStart = src;
     srcEnd = src + srcLen;
     srcClose = srcEnd;
+    flags = TclEncodingSetProfileFlags(flags);
     if ((flags & TCL_ENCODING_END) == 0) {
 	srcClose -= TCL_UTF_MAX;
     }
@@ -3865,7 +4176,7 @@ EscapeFromUtfProc(
 
 	    if (word == 0) {
 		state = oldState;
-		if (STOPONERROR) {
+		if (PROFILE_STRICT(flags)) {
 		    result = TCL_CONVERT_UNKNOWN;
 		    break;
 		}
@@ -4159,6 +4470,166 @@ InitializeEncodingSearchPath(
 }
 
 /*
+ *------------------------------------------------------------------------
+ *
+ * TclEncodingProfileParseName --
+ *
+ *	Maps an encoding profile name to its integer equivalent.
+ *
+ * Results:
+ *	TCL_OK on success or TCL_ERROR on failure.
+ *
+ * Side effects:
+ *	Returns the profile enum value in *profilePtr
+ *
+ *------------------------------------------------------------------------
+ */
+int
+TclEncodingProfileNameToId(
+    Tcl_Interp *interp,		/* For error messages. May be NULL */
+    const char *profileName,	/* Name of profile */
+    int *profilePtr)  		/* Output */
+{
+    size_t i;
+    size_t numProfiles = sizeof(encodingProfiles) / sizeof(encodingProfiles[0]);
+
+    for (i = 0; i < numProfiles; ++i) {
+	if (!strcmp(profileName, encodingProfiles[i].name)) {
+	    *profilePtr = encodingProfiles[i].value;
+	    return TCL_OK;
+	}
+    }
+    if (interp) {
+	Tcl_Obj *errorObj;
+	/* This code assumes at least two profiles :-) */
+	errorObj =
+	    Tcl_ObjPrintf("bad profile name \"%s\": must be",
+		profileName);
+	for (i = 0; i < (numProfiles - 1); ++i) {
+	    Tcl_AppendStringsToObj(
+		errorObj, " ", encodingProfiles[i].name, ",", NULL);
+	}
+	Tcl_AppendStringsToObj(
+	    errorObj, " or ", encodingProfiles[numProfiles-1].name, NULL);
+
+	Tcl_SetObjResult(interp, errorObj);
+	Tcl_SetErrorCode(
+	    interp, "TCL", "ENCODING", "PROFILE", profileName, NULL);
+    }
+    return TCL_ERROR;
+}
+
+/*
+ *------------------------------------------------------------------------
+ *
+ * TclEncodingProfileValueToName --
+ *
+ *	Maps an encoding profile value to its name.
+ *
+ * Results:
+ *	Pointer to the name or NULL on failure. Caller must not make
+ *	not modify the string and must make a copy to hold on to it.
+ *
+ * Side effects:
+ *	None.
+ *------------------------------------------------------------------------
+ */
+const char *
+TclEncodingProfileIdToName(
+    Tcl_Interp *interp,		/* For error messages. May be NULL */
+    int profileValue)		/* Profile #define value */
+{
+    size_t i;
+
+    for (i = 0; i < sizeof(encodingProfiles) / sizeof(encodingProfiles[0]); ++i) {
+	if (profileValue == encodingProfiles[i].value) {
+	    return encodingProfiles[i].name;
+	}
+    }
+    if (interp) {
+	Tcl_SetObjResult(
+	    interp,
+	    Tcl_ObjPrintf(
+		"Internal error. Bad profile id \"%d\".",
+		profileValue));
+	Tcl_SetErrorCode(
+	    interp, "TCL", "ENCODING", "PROFILEID", NULL);
+    }
+    return NULL;
+}
+
+/*
+ *------------------------------------------------------------------------
+ *
+ * TclEncodingSetProfileFlags --
+ *
+ *	Maps the flags supported in the encoding C API's to internal flags.
+ *
+ *	For backward compatibility reasons, TCL_ENCODING_STOPONERROR is
+ *	is mapped to the TCL_ENCODING_PROFILE_STRICT overwriting any profile
+ *	specified.
+ *
+ *	If no profile or an invalid profile is specified, it is set to
+ *	the default.
+ *
+ * Results:
+ *    Internal encoding flag mask.
+ *
+ * Side effects:
+ *    None.
+ *
+ *------------------------------------------------------------------------
+ */
+int TclEncodingSetProfileFlags(int flags)
+{
+    if (flags & TCL_ENCODING_STOPONERROR) {
+	CHANNEL_PROFILE_SET(flags, TCL_ENCODING_PROFILE_STRICT);
+    } else {
+	int profile = CHANNEL_PROFILE_GET(flags);
+	switch (profile) {
+	case TCL_ENCODING_PROFILE_TCL8:
+	case TCL_ENCODING_PROFILE_STRICT:
+	case TCL_ENCODING_PROFILE_REPLACE:
+	    break;
+	case 0: /* Unspecified by caller */
+	default:
+	    CHANNEL_PROFILE_SET(flags, TCL_ENCODING_PROFILE_DEFAULT);
+	    break;
+	}
+    }
+    return flags;
+}
+
+/*
+ *------------------------------------------------------------------------
+ *
+ * TclGetEncodingProfiles --
+ *
+ *	Get the list of supported encoding profiles.
+ *
+ * Results:
+ *	None.
+ *
+ * Side effects:
+ *	The list of profile names is stored in the interpreter result.
+ *
+ *------------------------------------------------------------------------
+ */
+void
+TclGetEncodingProfiles(Tcl_Interp *interp)
+{
+    size_t i, n;
+    Tcl_Obj *objPtr;
+    n = sizeof(encodingProfiles) / sizeof(encodingProfiles[0]);
+    objPtr = Tcl_NewListObj(n, NULL);
+    for (i = 0; i < n; ++i) {
+	Tcl_ListObjAppendElement(
+	    interp, objPtr, Tcl_NewStringObj(encodingProfiles[i].name, TCL_INDEX_NONE));
+    }
+    Tcl_SetObjResult(interp, objPtr);
+}
+
+/*
  * Local Variables:
  * mode: c
  * c-basic-offset: 4
diff --git a/generic/tclEvent.c b/generic/tclEvent.c
index 64935e6..a9ed1f6 100644
--- a/generic/tclEvent.c
+++ b/generic/tclEvent.c
@@ -957,7 +957,7 @@ Tcl_Exit(
     /*
      * Warning: this function SHOULD NOT return, as there is code that depends
      * on Tcl_Exit never returning. In fact, we will Tcl_Panic if anyone
-     * returns, so critical is this dependcy.
+     * returns, so critical is this dependency.
      *
      * If subsystems are not (yet) initialized, proper Tcl-finalization is
      * impossible, so fallback to system exit, see bug-[f8a33ce3db5d8cc2].
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 97122b9..7eb6a0e 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -1742,7 +1742,7 @@ TclCompileObj(
  *	of course).
  *
  * Side effects:
- *	valuePtr gets the new incrmented value.
+ *	valuePtr gets the new incremented value.
  *
  *----------------------------------------------------------------------
  */
@@ -3444,10 +3444,8 @@ TEBCresume(
 		}
 	    }
 	    DECACHE_STACK_INFO();
-	    Tcl_IncrRefCount(valueToAssign);
 	    objResultPtr = TclPtrSetVarIdx(interp, varPtr, arrayPtr, part1Ptr,
 		    part2Ptr, valueToAssign, TCL_LEAVE_ERR_MSG, opnd);
-	    TclDecrRefCount(valueToAssign);
 	    CACHE_STACK_INFO();
 	    if (!objResultPtr) {
 	    errorInLappendListPtr:
@@ -5073,8 +5071,7 @@ TEBCresume(
 	}
 	if (fromIdx == TCL_INDEX_NONE) {
 	    fromIdx = 0;
-	}
-	else if (fromIdx > length) {
+	} else if (fromIdx > length) {
 	    fromIdx = length;
 	}
 	numToDelete = 0;
@@ -5113,8 +5110,7 @@ TEBCresume(
 	    }
 	    TRACE_APPEND(("\"%.30s\"\n", O2S(objResultPtr)));
 	    NEXT_INST_V(6, opnd, 1);
-	}
-	else {
+	} else {
 	    if (Tcl_ListObjReplace(interp,
 				   valuePtr,
 				   fromIdx,
diff --git a/generic/tclFCmd.c b/generic/tclFCmd.c
index c1dbc88..a34e80a 100644
--- a/generic/tclFCmd.c
+++ b/generic/tclFCmd.c
@@ -426,7 +426,7 @@ TclFileDeleteCmd(
     if (result != TCL_OK) {
 	if (errfile == NULL) {
 	    /*
-	     * We try to accomodate poor error results from our Tcl_FS calls.
+	     * We try to accommodate poor error results from our Tcl_FS calls.
 	     */
 
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
diff --git a/generic/tclHash.c b/generic/tclHash.c
index 5cfc63c..4b31971 100644
--- a/generic/tclHash.c
+++ b/generic/tclHash.c
@@ -623,18 +623,18 @@ Tcl_HashStats(
      */
 
     result = (char *)Tcl_Alloc((NUM_COUNTERS * 60) + 300);
-    sprintf(result, "%" TCL_Z_MODIFIER "u entries in table, %" TCL_Z_MODIFIER "u buckets\n",
+    snprintf(result, 60, "%" TCL_Z_MODIFIER "u entries in table, %" TCL_Z_MODIFIER "u buckets\n",
 	    tablePtr->numEntries, tablePtr->numBuckets);
     p = result + strlen(result);
     for (i = 0; i < NUM_COUNTERS; i++) {
-	sprintf(p, "number of buckets with %" TCL_Z_MODIFIER "u entries: %" TCL_Z_MODIFIER "u\n",
+	snprintf(p, 60, "number of buckets with %" TCL_Z_MODIFIER "u entries: %" TCL_Z_MODIFIER "u\n",
 		i, count[i]);
 	p += strlen(p);
     }
-    sprintf(p, "number of buckets with %d or more entries: %" TCL_Z_MODIFIER "u\n",
+    snprintf(p, 60, "number of buckets with %d or more entries: %" TCL_Z_MODIFIER "u\n",
 	    NUM_COUNTERS, overflow);
     p += strlen(p);
-    sprintf(p, "average search distance for entry: %.1f", average);
+    snprintf(p, 60, "average search distance for entry: %.1f", average);
     return result;
 }
 
diff --git a/generic/tclIO.c b/generic/tclIO.c
index ce0dcc8..287a2f2 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -165,6 +165,7 @@ static int		CheckForDeadChannel(Tcl_Interp *interp,
 static void		CheckForStdChannelsBeingClosed(Tcl_Channel chan);
 static void		CleanupChannelHandlers(Tcl_Interp *interp,
 			    Channel *chanPtr);
+static void		CleanupTimerHandler(ChannelState *statePtr);
 static int		CloseChannel(Tcl_Interp *interp, Channel *chanPtr,
 			    int errorCode);
 static int		CloseChannelPart(Tcl_Interp *interp, Channel *chanPtr,
@@ -172,6 +173,7 @@ static int		CloseChannelPart(Tcl_Interp *interp, Channel *chanPtr,
 static int		CloseWrite(Tcl_Interp *interp, Channel *chanPtr);
 static void		CommonGetsCleanup(Channel *chanPtr);
 static int		CopyData(CopyState *csPtr, int mask);
+static void		DeleteTimerHandler(ChannelState *statePtr);
 static int		MoveBytes(CopyState *csPtr);
 
 static void		MBCallback(CopyState *csPtr, Tcl_Obj *errObj);
@@ -1675,8 +1677,12 @@ Tcl_CreateChannel(
     }
     statePtr->inputEncodingState  = NULL;
     statePtr->inputEncodingFlags  = TCL_ENCODING_START;
+    CHANNEL_PROFILE_SET(statePtr->inputEncodingFlags,
+			     TCL_ENCODING_PROFILE_DEFAULT);
     statePtr->outputEncodingState = NULL;
     statePtr->outputEncodingFlags = TCL_ENCODING_START;
+    CHANNEL_PROFILE_SET(statePtr->outputEncodingFlags,
+			     TCL_ENCODING_PROFILE_DEFAULT);
 
     /*
      * Set the channel up initially in AUTO input translation mode to accept
@@ -1704,6 +1710,7 @@ Tcl_CreateChannel(
     statePtr->scriptRecordPtr	= NULL;
     statePtr->bufSize		= CHANNELBUFFER_DEFAULT_SIZE;
     statePtr->timer		= NULL;
+    statePtr->timerChanPtr	= NULL;
     statePtr->csPtrR		= NULL;
     statePtr->csPtrW		= NULL;
     statePtr->outputStage	= NULL;
@@ -3149,8 +3156,8 @@ CloseChannel(
     /*
      * Cancel any outstanding timer.
      */
+    DeleteTimerHandler(statePtr);
 
-    Tcl_DeleteTimerHandler(statePtr->timer);
 
     /*
      * Mark the channel as deleted by clearing the type structure.
@@ -3502,7 +3509,7 @@ TclClose(
     /*
      * Cancel any outstanding timer.
      */
-    Tcl_DeleteTimerHandler(statePtr->timer);
+    DeleteTimerHandler(statePtr);
 
     /*
      * Invoke the registered close callbacks and delete their records.
@@ -3955,8 +3962,7 @@ Tcl_ClearChannelHandlers(
     /*
      * Cancel any outstanding timer.
      */
-
-    Tcl_DeleteTimerHandler(statePtr->timer);
+    DeleteTimerHandler(statePtr);
 
     /*
      * Remove any references to channel handlers for this channel that may be
@@ -4359,21 +4365,6 @@ Write(
     }
 
     /*
-     * Transfer encoding nocomplain/strict option to the encoding flags
-     */
-
-    if (GotFlag(statePtr, CHANNEL_ENCODING_NOCOMPLAIN)) {
-	statePtr->outputEncodingFlags |= TCL_ENCODING_NOCOMPLAIN;
-    } else {
-	statePtr->outputEncodingFlags &= ~TCL_ENCODING_NOCOMPLAIN;
-    }
-    if (GotFlag(statePtr, CHANNEL_ENCODING_STRICT)) {
-	statePtr->outputEncodingFlags |= TCL_ENCODING_STRICT;
-    } else {
-	statePtr->outputEncodingFlags &= ~TCL_ENCODING_STRICT;
-    }
-
-    /*
      * Write the terminated escape sequence even if srcLen is 0.
      */
 
@@ -4431,16 +4422,14 @@ Write(
 	 * current output encoding and strict encoding is active.
 	 */
 
-	if (result == TCL_CONVERT_UNKNOWN || result == TCL_CONVERT_SYNTAX) {
-	    encodingError = 1;
-	    result = TCL_OK;
-	}
-
-	if ((result != TCL_OK) && (srcRead + dstWrote == 0)) {
+	if (
+	    (result == TCL_CONVERT_UNKNOWN || result == TCL_CONVERT_SYNTAX)
+	    ||
 	    /*
 	     * We're reading from invalid/incomplete UTF-8.
 	     */
-
+	    ((result != TCL_OK) && (srcRead + dstWrote == 0))
+	) {
 	    encodingError = 1;
 	    result = TCL_OK;
 	}
@@ -4500,7 +4489,7 @@ Write(
 	     * beginning of the next buffer.
 	     */
 
-	    saved = 1 + ~SpaceLeft(bufPtr);
+	    saved = -SpaceLeft(bufPtr);
 	    memcpy(safe, dst + dstLen, saved);
 	    bufPtr->nextAdded = bufPtr->bufLength;
 	}
@@ -4697,21 +4686,6 @@ Tcl_GetsObj(
     }
 
     /*
-     * Transfer encoding nocomplain/strict option to the encoding flags
-     */
-
-    if (GotFlag(statePtr, CHANNEL_ENCODING_NOCOMPLAIN)) {
-	statePtr->inputEncodingFlags |= TCL_ENCODING_NOCOMPLAIN;
-    } else {
-	statePtr->inputEncodingFlags &= ~TCL_ENCODING_NOCOMPLAIN;
-    }
-    if (GotFlag(statePtr, CHANNEL_ENCODING_STRICT)) {
-	statePtr->inputEncodingFlags |= TCL_ENCODING_STRICT;
-    } else {
-	statePtr->inputEncodingFlags &= ~TCL_ENCODING_STRICT;
-    }
-
-    /*
      * Object used by FilterInputBytes to keep track of how much data has been
      * consumed from the channel buffers.
      */
@@ -4904,6 +4878,19 @@ Tcl_GetsObj(
 		goto done;
 	    }
 	    goto gotEOL;
+	} else if (gs.bytesWrote == 0
+		&& GotFlag(statePtr, CHANNEL_ENCODING_ERROR)
+		&& !GotFlag(statePtr, CHANNEL_NONBLOCKING)) {
+	    /* Set eol to the position that caused the encoding error, and then
+	     * coninue to gotEOL, which stores the data that was decoded
+	     * without error to objPtr.  This allows the caller to do something
+	     * useful with the data decoded so far, and also results in the
+	     * position of the file being the first byte that was not
+	     * succesfully decoded, allowing further processing at exactly that
+	     * point, if desired.
+	     */
+	    eol = dstEnd;
+	    goto gotEOL;
 	}
 	dst = dstEnd;
     }
@@ -5020,6 +5007,11 @@ Tcl_GetsObj(
     }
     UpdateInterest(chanPtr);
     TclChannelRelease((Tcl_Channel)chanPtr);
+    if (GotFlag(statePtr, CHANNEL_ENCODING_ERROR) &&
+	    (copiedTotal == 0 || !GotFlag(statePtr, CHANNEL_NONBLOCKING))) {
+	Tcl_SetErrno(EILSEQ);
+	copiedTotal = -1;
+    }
     return copiedTotal;
 }
 
@@ -5474,21 +5466,6 @@ FilterInputBytes(
     }
     gsPtr->state = statePtr->inputEncodingState;
 
-    /*
-     * Transfer encoding nocomplain/strict option to the encoding flags
-     */
-
-    if (GotFlag(statePtr, CHANNEL_ENCODING_NOCOMPLAIN)) {
-	statePtr->inputEncodingFlags |= TCL_ENCODING_NOCOMPLAIN;
-    } else {
-	statePtr->inputEncodingFlags &= ~TCL_ENCODING_NOCOMPLAIN;
-    }
-    if (GotFlag(statePtr, CHANNEL_ENCODING_STRICT)) {
-	statePtr->inputEncodingFlags |= TCL_ENCODING_STRICT;
-    } else {
-	statePtr->inputEncodingFlags &= ~TCL_ENCODING_STRICT;
-    }
-
     result = Tcl_ExternalToUtf(NULL, gsPtr->encoding, raw, rawLen,
 	    statePtr->inputEncodingFlags | TCL_ENCODING_NO_TERMINATE,
 	    &statePtr->inputEncodingState, dst, spaceLeft, &gsPtr->rawRead,
@@ -6070,6 +6047,23 @@ DoReadChars(
 		    statePtr->inQueueTail = NULL;
 		}
 	    }
+
+	    /*
+	     * If CHANNEL_ENCODING_ERROR and CHANNEL_STICKY_EOF are both set,
+	     * then CHANNEL_ENCODING_ERROR was caused by data that occurred
+	     * after the EOF character was encountered, so it doesn't count as
+	     * a real error.
+	     */
+
+	    if (GotFlag(statePtr, CHANNEL_ENCODING_ERROR)
+		    && !GotFlag(statePtr, CHANNEL_STICKY_EOF)
+		    && !GotFlag(statePtr, CHANNEL_NONBLOCKING)) {
+		/* Channel is blocking.  Return an error so that callers
+		 * like [read] can return an error.
+		*/
+		Tcl_SetErrno(EILSEQ);
+		goto finish;
+	    }
 	}
 
 	if (copiedNow < 0) {
@@ -6100,6 +6094,7 @@ DoReadChars(
 	}
     }
 
+finish:
     /*
      * Failure to fill a channel buffer may have left channel reporting a
      * "blocked" state, but so long as we fulfilled the request here, the
@@ -6133,6 +6128,11 @@ DoReadChars(
     assert(!(GotFlag(statePtr, CHANNEL_EOF|CHANNEL_BLOCKED)
             == (CHANNEL_EOF|CHANNEL_BLOCKED)));
     UpdateInterest(chanPtr);
+    if (GotFlag(statePtr, CHANNEL_ENCODING_ERROR)
+	    && (!copied || !GotFlag(statePtr, CHANNEL_NONBLOCKING))) {
+	Tcl_SetErrno(EILSEQ);
+	copied = -1;
+    }
     TclChannelRelease((Tcl_Channel)chanPtr);
     return copied;
 }
@@ -6278,21 +6278,6 @@ ReadChars(
     }
 
     /*
-     * Transfer encoding nocomplain/strict option to the encoding flags
-     */
-
-    if (GotFlag(statePtr, CHANNEL_ENCODING_NOCOMPLAIN)) {
-	statePtr->inputEncodingFlags |= TCL_ENCODING_NOCOMPLAIN;
-    } else {
-	statePtr->inputEncodingFlags &= ~TCL_ENCODING_NOCOMPLAIN;
-    }
-    if (GotFlag(statePtr, CHANNEL_ENCODING_STRICT)) {
-	statePtr->inputEncodingFlags |= TCL_ENCODING_STRICT;
-    } else {
-	statePtr->inputEncodingFlags &= ~TCL_ENCODING_STRICT;
-    }
-
-    /*
      * This routine is burdened with satisfying several constraints. It cannot
      * append more than 'charsToRead` chars onto objPtr. This is measured
      * after encoding and translation transformations are completed. There is
@@ -6778,11 +6763,14 @@ TranslateInputEOL(
 	 * EOF character was seen in EOL translated range. Leave current file
 	 * position pointing at the EOF character, but don't store the EOF
 	 * character in the output string.
+	 *
+	 * If CHANNEL_ENCODING_ERROR is set, it can only be because of data
+	 * encountered after the EOF character, so it is nonsense.  Unset it.
 	 */
 
 	SetFlag(statePtr, CHANNEL_EOF | CHANNEL_STICKY_EOF);
 	statePtr->inputEncodingFlags |= TCL_ENCODING_END;
-	ResetFlag(statePtr, CHANNEL_BLOCKED|INPUT_SAW_CR);
+	ResetFlag(statePtr, CHANNEL_BLOCKED|INPUT_SAW_CR|CHANNEL_ENCODING_ERROR);
     }
 }
 
@@ -7555,8 +7543,7 @@ Tcl_Eof(
     ChannelState *statePtr = ((Channel *) chan)->state;
 				/* State of real channel structure. */
 
-    if (GotFlag(statePtr, CHANNEL_NONBLOCKING|CHANNEL_FCOPY)
-	    && GotFlag(statePtr, CHANNEL_ENCODING_ERROR)) {
+    if (GotFlag(statePtr, CHANNEL_ENCODING_ERROR)) {
 	return 0;
     }
     return GotFlag(statePtr, CHANNEL_EOF) ? 1 : 0;
@@ -7833,7 +7820,7 @@ Tcl_BadChannelOption(
 {
     if (interp != NULL) {
 	const char *genericopt =
-		"blocking buffering buffersize encoding eofchar nocomplainencoding strictencoding translation";
+		"blocking buffering buffersize encoding eofchar profile translation";
 	const char **argv;
 	Tcl_Size argc, i;
 	Tcl_DString ds;
@@ -7893,7 +7880,7 @@ Tcl_GetChannelOption(
     Tcl_DString *dsPtr)		/* Where to store value(s). */
 {
     size_t len;			/* Length of optionName string. */
-    char optionVal[128];	/* Buffer for sprintf. */
+    char optionVal[128];	/* Buffer for snprintf. */
     Channel *chanPtr = (Channel *) chan;
     ChannelState *statePtr = chanPtr->state;
 				/* State info for channel */
@@ -7994,7 +7981,7 @@ Tcl_GetChannelOption(
 	    Tcl_DStringAppendElement(dsPtr, "-eofchar");
 	}
 	if ((flags & TCL_READABLE) && (statePtr->inEofChar != 0)) {
-	    sprintf(buf, "%c", statePtr->inEofChar);
+	    snprintf(buf, sizeof(buf), "%c", statePtr->inEofChar);
 	}
 	if (len > 0) {
 		Tcl_DStringAppend(dsPtr, buf, TCL_INDEX_NONE);
@@ -8002,22 +7989,19 @@ Tcl_GetChannelOption(
 	}
 	Tcl_DStringAppendElement(dsPtr, buf);
     }
-    if (len == 0 || HaveOpt(1, "-nocomplainencoding")) {
+    if (len == 0 || HaveOpt(1, "-profile")) {
+	int profile;
+	const char *profileName;
 	if (len == 0) {
-	    Tcl_DStringAppendElement(dsPtr, "-nocomplainencoding");
+	    Tcl_DStringAppendElement(dsPtr, "-profile");
 	}
-	Tcl_DStringAppendElement(dsPtr,
-		(flags & CHANNEL_ENCODING_NOCOMPLAIN) ? "1" : "0");
-	if (len > 0) {
-	    return TCL_OK;
-	}
-    }
-    if (len == 0 || HaveOpt(1, "-strictencoding")) {
-	if (len == 0) {
-	    Tcl_DStringAppendElement(dsPtr, "-strictencoding");
+	/* Note currently input and output profiles are same */
+	profile = CHANNEL_PROFILE_GET(statePtr->inputEncodingFlags);
+	profileName = TclEncodingProfileIdToName(interp, profile);
+	if (profileName == NULL) {
+	    return TCL_ERROR;
 	}
-	Tcl_DStringAppendElement(dsPtr,
-		(flags & CHANNEL_ENCODING_STRICT) ? "1" : "0");
+	Tcl_DStringAppendElement(dsPtr, profileName);
 	if (len > 0) {
 	    return TCL_OK;
 	}
@@ -8203,6 +8187,7 @@ Tcl_SetChannelOption(
 	return TCL_OK;
     } else if (HaveOpt(2, "-encoding")) {
 	Tcl_Encoding encoding;
+	int profile;
 
 	if ((newValue[0] == '\0') || (strcmp(newValue, "binary") == 0)) {
 	    encoding = NULL;
@@ -8227,9 +8212,12 @@ Tcl_SetChannelOption(
 	Tcl_FreeEncoding(statePtr->encoding);
 	statePtr->encoding = encoding;
 	statePtr->inputEncodingState = NULL;
+	profile = CHANNEL_PROFILE_GET(statePtr->inputEncodingFlags);
 	statePtr->inputEncodingFlags = TCL_ENCODING_START;
+	CHANNEL_PROFILE_SET(statePtr->inputEncodingFlags, profile);
 	statePtr->outputEncodingState = NULL;
 	statePtr->outputEncodingFlags = TCL_ENCODING_START;
+	CHANNEL_PROFILE_SET(statePtr->outputEncodingFlags, profile); /* Same as input */
 	ResetFlag(statePtr, CHANNEL_NEED_MORE_DATA|CHANNEL_ENCODING_ERROR);
 	UpdateInterest(chanPtr);
 	return TCL_OK;
@@ -8267,30 +8255,13 @@ Tcl_SetChannelOption(
 	ResetFlag(statePtr, CHANNEL_EOF|CHANNEL_STICKY_EOF|CHANNEL_BLOCKED);
 	statePtr->inputEncodingFlags &= ~TCL_ENCODING_END;
 	return TCL_OK;
-    } else if (HaveOpt(1, "-nocomplainencoding")) {
-	int newMode;
-
-	if (Tcl_GetBoolean(interp, newValue, &newMode) == TCL_ERROR) {
+    } else if (HaveOpt(1, "-profile")) {
+	int profile;
+	if (TclEncodingProfileNameToId(interp, newValue, &profile) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	if (newMode) {
-	    SetFlag(statePtr, CHANNEL_ENCODING_NOCOMPLAIN);
-	} else {
-	    ResetFlag(statePtr, CHANNEL_ENCODING_NOCOMPLAIN);
-	}
-	ResetFlag(statePtr, CHANNEL_NEED_MORE_DATA|CHANNEL_ENCODING_ERROR);
-	return TCL_OK;
-    } else if (HaveOpt(1, "-strictencoding")) {
-	int newMode;
-
-	if (Tcl_GetBoolean(interp, newValue, &newMode) == TCL_ERROR) {
-	    return TCL_ERROR;
-	}
-	if (newMode) {
-	    SetFlag(statePtr, CHANNEL_ENCODING_STRICT);
-	} else {
-	    ResetFlag(statePtr, CHANNEL_ENCODING_STRICT);
-	}
+	CHANNEL_PROFILE_SET(statePtr->inputEncodingFlags, profile);
+	CHANNEL_PROFILE_SET(statePtr->outputEncodingFlags, profile);
 	ResetFlag(statePtr, CHANNEL_NEED_MORE_DATA|CHANNEL_ENCODING_ERROR);
 	return TCL_OK;
     } else if (HaveOpt(1, "-translation")) {
@@ -8712,8 +8683,10 @@ UpdateInterest(
 	    mask &= ~TCL_EXCEPTION;
 
 	    if (!statePtr->timer) {
+		TclChannelPreserve((Tcl_Channel)chanPtr);
+		statePtr->timerChanPtr = chanPtr;
 		statePtr->timer = Tcl_CreateTimerHandler(SYNTHETIC_EVENT_TIME,
-                        ChannelTimerProc, chanPtr);
+		    ChannelTimerProc, chanPtr);
 	    }
 	}
     }
@@ -8722,6 +8695,8 @@ UpdateInterest(
 	&& mask & TCL_WRITABLE
 	&& GotFlag(statePtr, CHANNEL_NONBLOCKING)) {
 
+	TclChannelPreserve((Tcl_Channel)chanPtr);
+	statePtr->timerChanPtr = chanPtr;
 	statePtr->timer = Tcl_CreateTimerHandler(SYNTHETIC_EVENT_TIME,
 	    ChannelTimerProc,chanPtr);
     }
@@ -8752,48 +8727,75 @@ ChannelTimerProc(
     void *clientData)
 {
     Channel *chanPtr = (Channel *)clientData;
-
     /* State info for channel */
     ChannelState *statePtr = chanPtr->state;
 
-	/* Preserve chanPtr to guard against deallocation in Tcl_NotifyChannel. */
-    TclChannelPreserve((Tcl_Channel)chanPtr);
-    Tcl_Preserve(statePtr);
-    statePtr->timer = NULL;
-    if (statePtr->interestMask & TCL_WRITABLE
-	&& GotFlag(statePtr, CHANNEL_NONBLOCKING)
-	&& !GotFlag(statePtr, BG_FLUSH_SCHEDULED)
-	) {
-	/*
-	 * Restart the timer in case a channel handler reenters the event loop
-	 * before UpdateInterest gets called by Tcl_NotifyChannel.
-	 */
-	statePtr->timer = Tcl_CreateTimerHandler(SYNTHETIC_EVENT_TIME,
-                ChannelTimerProc,chanPtr);
-	Tcl_NotifyChannel((Tcl_Channel) chanPtr, TCL_WRITABLE);
-    }
+    /* TclChannelPreserve() must be called before the current function was
+     * scheduled, is already in effect.  In this function it guards against
+     * deallocation in Tcl_NotifyChannel and also keps the channel preserved
+     * until ChannelTimerProc is later called again.
+     */
 
-    /* The channel may have just been closed from within Tcl_NotifyChannel */
-    if (!GotFlag(statePtr, CHANNEL_INCLOSE)) {
-	if (!GotFlag(statePtr, CHANNEL_NEED_MORE_DATA)
-		&& (statePtr->interestMask & TCL_READABLE)
-		&& (statePtr->inQueueHead != NULL)
-		&& IsBufferReady(statePtr->inQueueHead)) {
+    if (chanPtr->typePtr == NULL) {
+	CleanupTimerHandler(statePtr);
+    } else {
+	Tcl_Preserve(statePtr);
+	statePtr->timer = NULL;
+	if (statePtr->interestMask & TCL_WRITABLE
+	    && GotFlag(statePtr, CHANNEL_NONBLOCKING)
+	    && !GotFlag(statePtr, BG_FLUSH_SCHEDULED)
+	    ) {
 	    /*
 	     * Restart the timer in case a channel handler reenters the event loop
 	     * before UpdateInterest gets called by Tcl_NotifyChannel.
 	     */
-
 	    statePtr->timer = Tcl_CreateTimerHandler(SYNTHETIC_EVENT_TIME,
-		    ChannelTimerProc,chanPtr);
-	    Tcl_NotifyChannel((Tcl_Channel) chanPtr, TCL_READABLE);
+		ChannelTimerProc,chanPtr);
+	    Tcl_NotifyChannel((Tcl_Channel) chanPtr, TCL_WRITABLE);
 	} else {
-	    UpdateInterest(chanPtr);
+	    /* The channel may have just been closed from within Tcl_NotifyChannel */
+	    if (!GotFlag(statePtr, CHANNEL_INCLOSE)) {
+		if (!GotFlag(statePtr, CHANNEL_NEED_MORE_DATA)
+		    && (statePtr->interestMask & TCL_READABLE)
+		    && (statePtr->inQueueHead != NULL)
+		    && IsBufferReady(statePtr->inQueueHead)) {
+		    /*
+		     * Restart the timer in case a channel handler reenters the event loop
+		     * before UpdateInterest gets called by Tcl_NotifyChannel.
+		     */
+
+		    statePtr->timer = Tcl_CreateTimerHandler(SYNTHETIC_EVENT_TIME,
+			ChannelTimerProc,chanPtr);
+		    Tcl_NotifyChannel((Tcl_Channel) chanPtr, TCL_READABLE);
+		} else {
+		    CleanupTimerHandler(statePtr);
+		    UpdateInterest(chanPtr);
+		}
+	    } else {
+		CleanupTimerHandler(statePtr);
+	    }
 	}
+	Tcl_Release(statePtr);
     }
-
-    Tcl_Release(statePtr);
-    TclChannelRelease((Tcl_Channel)chanPtr);
+}
+
+static void
+DeleteTimerHandler(
+    ChannelState *statePtr
+)
+{
+    if (statePtr->timer != NULL) {
+	Tcl_DeleteTimerHandler(statePtr->timer);
+	CleanupTimerHandler(statePtr);
+    }
+}
+static void
+CleanupTimerHandler(
+    ChannelState *statePtr
+){
+    TclChannelRelease((Tcl_Channel)statePtr->timerChanPtr);
+    statePtr->timer = NULL;
+    statePtr->timerChanPtr = NULL;
 }
 
 /*
@@ -9371,8 +9373,8 @@ TclCopyChannel(
 	    && inStatePtr->inputTranslation == TCL_TRANSLATE_LF
 	    && outStatePtr->outputTranslation == TCL_TRANSLATE_LF
 	    && inStatePtr->encoding == outStatePtr->encoding
-	    && (inStatePtr->flags & TCL_ENCODING_STRICT) != TCL_ENCODING_STRICT
-	    && outStatePtr->flags & TCL_ENCODING_NOCOMPLAIN;
+	    && CHANNEL_PROFILE_GET(inStatePtr->inputEncodingFlags) == TCL_ENCODING_PROFILE_TCL8
+	    && CHANNEL_PROFILE_GET(outStatePtr->outputEncodingFlags) == TCL_ENCODING_PROFILE_TCL8;
 
     /*
      * Allocate a new CopyState to maintain info about the current copy in
@@ -9698,12 +9700,11 @@ CopyData(
      * the bottom of the stack.
      */
 
-    SetFlag(inStatePtr, CHANNEL_FCOPY);
     inBinary = (inStatePtr->encoding == NULL);
     outBinary = (outStatePtr->encoding == NULL);
     sameEncoding = inStatePtr->encoding == outStatePtr->encoding
-	    && (inStatePtr->flags & TCL_ENCODING_STRICT) != TCL_ENCODING_STRICT
-	    && outStatePtr->flags & TCL_ENCODING_NOCOMPLAIN;
+	    && CHANNEL_PROFILE_GET(inStatePtr->inputEncodingFlags) == TCL_ENCODING_PROFILE_TCL8
+	    && CHANNEL_PROFILE_GET(outStatePtr->outputEncodingFlags) == TCL_ENCODING_PROFILE_TCL8;
 
     if (!(inBinary || sameEncoding)) {
 	TclNewObj(bufObj);
@@ -9814,7 +9815,6 @@ CopyData(
 		    TclDecrRefCount(bufObj);
 		    bufObj = NULL;
 		}
-		ResetFlag(inStatePtr, CHANNEL_FCOPY);
 		return TCL_OK;
 	    }
 	}
@@ -9906,7 +9906,6 @@ CopyData(
 		TclDecrRefCount(bufObj);
 		bufObj = NULL;
 	    }
-	    ResetFlag(inStatePtr, CHANNEL_FCOPY);
 	    return TCL_OK;
 	}
 
@@ -9929,7 +9928,6 @@ CopyData(
 		TclDecrRefCount(bufObj);
 		bufObj = NULL;
 	    }
-	    ResetFlag(inStatePtr, CHANNEL_FCOPY);
 	    return TCL_OK;
 	}
     } /* while */
@@ -9982,7 +9980,6 @@ CopyData(
 	    }
 	}
     }
-    ResetFlag(inStatePtr, CHANNEL_FCOPY);
     return result;
 }
 
diff --git a/generic/tclIO.h b/generic/tclIO.h
index 588c7d4..76269a1 100644
--- a/generic/tclIO.h
+++ b/generic/tclIO.h
@@ -36,12 +36,12 @@
  */
 
 typedef struct ChannelBuffer {
-    size_t refCount;		/* Current uses count */
-    size_t nextAdded;		/* The next position into which a character
+    Tcl_Size refCount;		/* Current uses count */
+    Tcl_Size nextAdded;		/* The next position into which a character
 				 * will be put in the buffer. */
-    size_t nextRemoved;		/* Position of next byte to be removed from
+    Tcl_Size nextRemoved;		/* Position of next byte to be removed from
 				 * the buffer. */
-    size_t bufLength;		/* How big is the buffer? */
+    Tcl_Size bufLength;		/* How big is the buffer? */
     struct ChannelBuffer *nextPtr;
     				/* Next buffer in chain. */
     char buf[TCLFLEXARRAY];		/* Placeholder for real buffer. The real
@@ -113,7 +113,7 @@ typedef struct Channel {
     ChannelBuffer *inQueueHead;	/* Points at first buffer in input queue. */
     ChannelBuffer *inQueueTail;	/* Points at last buffer in input queue. */
 
-    size_t refCount;
+    Tcl_Size refCount;
 } Channel;
 
 /*
@@ -165,7 +165,7 @@ typedef struct ChannelState {
     int unreportedError;	/* Non-zero if an error report was deferred
 				 * because it happened in the background. The
 				 * value is the POSIX error code. */
-    size_t refCount;		/* How many interpreters hold references to
+    Tcl_Size refCount;		/* How many interpreters hold references to
 				 * this IO channel? */
     struct CloseCallback *closeCbPtr;
 				/* Callbacks registered to be called when the
@@ -188,8 +188,11 @@ typedef struct ChannelState {
     EventScriptRecord *scriptRecordPtr;
 				/* Chain of all scripts registered for event
 				 * handlers ("fileevent") on this channel. */
-    size_t bufSize;		/* What size buffers to allocate? */
+    Tcl_Size bufSize;		/* What size buffers to allocate? */
     Tcl_TimerToken timer;	/* Handle to wakeup timer for this channel. */
+    Channel *timerChanPtr;	/* Needed in order to decrement the refCount of
+				   the right channel when the timer is
+				   deleted. */
     struct CopyState *csPtrR;	/* State of background copy for which channel
 				 * is input, or NULL. */
     struct CopyState *csPtrW;	/* State of background copy for which channel
@@ -235,8 +238,6 @@ typedef struct ChannelState {
 					 * flushed after every newline. */
 #define CHANNEL_UNBUFFERED	(1<<5)	/* Output to the channel must always
 					 * be flushed immediately. */
-#define CHANNEL_FCOPY	(1<<6)	/* Channel is currently doing an fcopy
-					 * mode. */
 #define BG_FLUSH_SCHEDULED	(1<<7)	/* A background flush of the queued
 					 * output buffers has been
 					 * scheduled. */
@@ -279,19 +280,21 @@ typedef struct ChannelState {
 					 * encountered an encoding error */
 #define CHANNEL_RAW_MODE	(1<<16)	/* When set, notes that the Raw API is
 					 * being used. */
-#define CHANNEL_ENCODING_NOCOMPLAIN	(1<<17)	/* set if option
-					 * -nocomplainencoding is set to 1 */
-#define CHANNEL_ENCODING_STRICT	(1<<18)	/* set if option
-					 * -strictencoding is set to 1 */
 #define CHANNEL_INCLOSE		(1<<19)	/* Channel is currently being closed.
 					 * Its structures are still live and
 					 * usable, but it may not be closed
 					 * again from within the close
 					 * handler. */
-#define ENCODING_FAILINDEX	(1<<20) /* Internal flag, fail on Invalid bytes only */
 #define CHANNEL_CLOSEDWRITE	(1<<21)	/* Channel write side has been closed.
 					 * No further Tcl-level write IO on
 					 * the channel is allowed. */
+#define CHANNEL_PROFILE_MASK     0xFF000000
+#define CHANNEL_PROFILE_GET(flags_)  ((flags_) & CHANNEL_PROFILE_MASK)
+#define CHANNEL_PROFILE_SET(flags_, profile_) \
+    do {                                           \
+	(flags_) &= ~CHANNEL_PROFILE_MASK;    \
+	(flags_) |= profile_;                      \
+    } while (0)
 
 /*
  * The length of time to wait between synthetic timer events. Must be zero or
diff --git a/generic/tclIOCmd.c b/generic/tclIOCmd.c
index 2298d48..cdb8083 100644
--- a/generic/tclIOCmd.c
+++ b/generic/tclIOCmd.c
@@ -10,6 +10,7 @@
  */
 
 #include "tclInt.h"
+#include "tclTomMath.h"
 
 /*
  * Callback structure for accept callback in a TCP server.
@@ -44,7 +45,7 @@ static void			RegisterTcpServerInterpCleanup(
 				    Tcl_Interp *interp,
 				    AcceptCallback *acceptCallbackPtr);
 static Tcl_InterpDeleteProc	TcpAcceptCallbacksDeleteProc;
-static void		TcpServerCloseProc(ClientData callbackData);
+static void		TcpServerCloseProc(void *callbackData);
 static void		UnregisterTcpServerInterpCleanupProc(
 			    Tcl_Interp *interp,
 			    AcceptCallback *acceptCallbackPtr);
@@ -330,7 +331,9 @@ Tcl_GetsObjCmd(
 	    code = TCL_ERROR;
 	    goto done;
 	}
-	Tcl_SetObjResult(interp, Tcl_NewWideIntObj((Tcl_WideInt)((Tcl_WideUInt)(lineLen + 1U)) - 1));
+	Tcl_Obj *lineLenObj;
+	TclNewIndexObj(lineLenObj, lineLen);
+	Tcl_SetObjResult(interp, lineLenObj);
     } else {
 	Tcl_SetObjResult(interp, linePtr);
     }
@@ -1183,7 +1186,7 @@ Tcl_OpenObjCmd(
 
 static void
 TcpAcceptCallbacksDeleteProc(
-    ClientData clientData,	/* Data which was passed when the assocdata
+    void *clientData,	/* Data which was passed when the assocdata
 				 * was registered. */
     TCL_UNUSED(Tcl_Interp *))
 {
@@ -1311,7 +1314,7 @@ UnregisterTcpServerInterpCleanupProc(
 
 static void
 AcceptCallbackProc(
-    ClientData callbackData,	/* The data stored when the callback was
+    void *callbackData,	/* The data stored when the callback was
 				 * created in the call to
 				 * Tcl_OpenTcpServer. */
     Tcl_Channel chan,		/* Channel for the newly accepted
@@ -1402,7 +1405,7 @@ AcceptCallbackProc(
 
 static void
 TcpServerCloseProc(
-    ClientData callbackData)	/* The data passed in the call to
+    void *callbackData)	/* The data passed in the call to
 				 * Tcl_CreateCloseHandler. */
 {
     AcceptCallback *acceptCallbackPtr = (AcceptCallback *)callbackData;
diff --git a/generic/tclIORChan.c b/generic/tclIORChan.c
index ba2d2cb..fcdb530 100644
--- a/generic/tclIORChan.c
+++ b/generic/tclIORChan.c
@@ -549,7 +549,7 @@ TclChanCreateObjCmd(
 
     /*
      * First argument is a list of modes. Allowed entries are "read", "write".
-     * Expect at least one list element. Abbreviations are ok.
+     * Empty list is uncommon, but allowed. Abbreviations are ok.
      */
 
     modeObj = objv[MODE];
@@ -922,6 +922,11 @@ TclChanPostEventObjCmd(
     if (EncodeEventMask(interp, "event", objv[EVENT], &events) != TCL_OK) {
 	return TCL_ERROR;
     }
+    if (events == 0) {
+	Tcl_SetObjResult(interp,
+		Tcl_NewStringObj("bad event list: is empty", -1));
+	return TCL_ERROR;
+    }
 
     /*
      * Check that the channel is actually interested in the provided events.
@@ -2111,10 +2116,10 @@ ReflectTruncate(
  * EncodeEventMask --
  *
  *	This function takes a list of event items and constructs the
- *	equivalent internal bitmask. The list must contain at least one
- *	element. Elements are "read", "write", or any unique abbreviation of
- *	them. Note that the bitmask is not changed if problems are
- *	encountered.
+ *	equivalent internal bitmask. The list may be empty but will usually
+ *	contain at least one element. Valid elements are "read", "write", or
+ *	any unique abbreviation of them. Note that the bitmask is not changed
+ *	if problems are encountered.
  *
  * Results:
  *	A standard Tcl error code. A bitmask where TCL_READABLE and/or
@@ -2144,12 +2149,6 @@ EncodeEventMask(
 	return TCL_ERROR;
     }
 
-    if (listc < 1) {
-	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-                "bad %s list: is empty", objName));
-	return TCL_ERROR;
-    }
-
     events = 0;
     while (listc > 0) {
 	if (Tcl_GetIndexFromObj(interp, listv[listc-1], eventOptions,
@@ -3321,7 +3320,7 @@ ForwardProc(
 		 */
 
 		char *buf = (char *)Tcl_Alloc(200);
-		sprintf(buf,
+		snprintf(buf, 200,
 			"{Expected list with even number of elements, got %" TCL_Z_MODIFIER "u %s instead}",
 			listc, (listc == 1 ? "element" : "elements"));
 
diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c
index 436d364..dc13a18 100644
--- a/generic/tclIOUtil.c
+++ b/generic/tclIOUtil.c
@@ -178,7 +178,7 @@ const Tcl_Filesystem tclNativeFilesystem = {
 /*
  * An initial record in the linked list for the native filesystem.  Remains at
  * the tail of the list and is never freed.  Currently the native filesystem is
- * hard-coded.  It may make sense to modify this to accomodate unconventional
+ * hard-coded.  It may make sense to modify this to accommodate unconventional
  * uses of Tcl that provide no native filesystem.
  */
 
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 827fd6f..fd6d4177 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -131,6 +131,7 @@
 
 #if defined(_WIN32) && defined(_MSC_VER)
 #   define vsnprintf _vsnprintf
+#   define snprintf _snprintf
 #endif
 
 #if !defined(TCL_THREADS)
@@ -2875,7 +2876,19 @@ MODULE_SCOPE int tclFindExecutableSearchDone;
 MODULE_SCOPE char *tclMemDumpFileName;
 MODULE_SCOPE TclPlatformType tclPlatform;
 
+/*
+ * Declarations related to internal encoding functions.
+ */
+
 MODULE_SCOPE Tcl_Encoding tclIdentityEncoding;
+MODULE_SCOPE int
+TclEncodingProfileNameToId(Tcl_Interp *interp,
+			   const char *profileName,
+			   int *profilePtr);
+MODULE_SCOPE const char *TclEncodingProfileIdToName(Tcl_Interp *interp,
+						    int profileId);
+MODULE_SCOPE int TclEncodingSetProfileFlags(int flags);
+MODULE_SCOPE void TclGetEncodingProfiles(Tcl_Interp *interp);
 
 /*
  * TIP #233 (Virtualized Time)
@@ -4748,6 +4761,8 @@ MODULE_SCOPE Tcl_LibraryInitProc TclThread_Init;
 MODULE_SCOPE Tcl_LibraryInitProc Procbodytest_Init;
 MODULE_SCOPE Tcl_LibraryInitProc Procbodytest_SafeInit;
 
+
+
 /*
  *----------------------------------------------------------------
  * Macro used by the Tcl core to check whether a pattern has any characters
@@ -4898,7 +4913,14 @@ MODULE_SCOPE Tcl_LibraryInitProc Procbodytest_SafeInit;
     } while (0)
 
 #define TclNewIndexObj(objPtr, w) \
-    (objPtr) = (((Tcl_WideUInt)w) >= TCL_INDEX_NONE) ? Tcl_NewWideIntObj(-1) : Tcl_NewWideIntObj(w)
+    do { \
+	Tcl_WideUInt _uw = (Tcl_WideUInt)(w); \
+	if (_uw >= TCL_INDEX_NONE) { \
+	    TclNewIntObj(objPtr, -1); \
+	} else { \
+	    TclNewUIntObj(objPtr, _uw); \
+	} \
+	} while (0)
 
 #define TclNewDoubleObj(objPtr, d) \
     (objPtr) = Tcl_NewDoubleObj(d)
diff --git a/generic/tclInterp.c b/generic/tclInterp.c
index ecc6e15..6fa9f61 100644
--- a/generic/tclInterp.c
+++ b/generic/tclInterp.c
@@ -60,7 +60,7 @@ typedef struct {
     Tcl_Obj *objPtr;		/* The first actual prefix object - the target
 				 * command name; this has to be at the end of
 				 * the structure, which will be extended to
-				 * accomodate the remaining objects in the
+				 * accommodate the remaining objects in the
 				 * prefix. */
 } Alias;
 
@@ -832,7 +832,7 @@ NRInterpCmd(
 	    for (i = 0; ; i++) {
 		Tcl_CmdInfo cmdInfo;
 
-		sprintf(buf, "interp%d", i);
+		snprintf(buf, sizeof(buf), "interp%d", i);
 		if (Tcl_GetCommandInfo(interp, buf, &cmdInfo) == 0) {
 		    break;
 		}
diff --git a/generic/tclListObj.c b/generic/tclListObj.c
index 7cf96cb..30bddb2 100644
--- a/generic/tclListObj.c
+++ b/generic/tclListObj.c
@@ -2344,7 +2344,7 @@ Tcl_ListObjReplace(
      */
 
     /*
-     * Calculate shifts if necessary to accomodate insertions.
+     * Calculate shifts if necessary to accommodate insertions.
      * NOTE: all indices are relative to listObjs which is not necessarily the
      * start of the ListStore storage area.
      *
diff --git a/generic/tclLiteral.c b/generic/tclLiteral.c
index 24e99fc..c189b50 100644
--- a/generic/tclLiteral.c
+++ b/generic/tclLiteral.c
@@ -179,8 +179,8 @@ TclCreateLiteral(
     const char *bytes,	/* The start of the string. Note that this is
 				 * not a NUL-terminated string. */
     size_t length,		/* Number of bytes in the string. */
-    size_t hash,		/* The string's hash. If -1, it will be
-				 * computed here. */
+    size_t hash,		/* The string's hash. If the value is
+				 * TCL_INDEX_NONE, it will be computed here. */
     int *newPtr,
     Namespace *nsPtr,
     int flags,
@@ -1128,18 +1128,18 @@ TclLiteralStats(
      */
 
     result = (char *)Tcl_Alloc(NUM_COUNTERS*60 + 300);
-    sprintf(result, "%" TCL_Z_MODIFIER "u entries in table, %" TCL_Z_MODIFIER "u buckets\n",
+    snprintf(result, 60, "%" TCL_Z_MODIFIER "u entries in table, %" TCL_Z_MODIFIER "u buckets\n",
 	    tablePtr->numEntries, tablePtr->numBuckets);
     p = result + strlen(result);
     for (i=0 ; i<NUM_COUNTERS ; i++) {
-	sprintf(p, "number of buckets with %" TCL_Z_MODIFIER "u entries: %" TCL_Z_MODIFIER "u\n",
+	snprintf(p, 60, "number of buckets with %" TCL_Z_MODIFIER "u entries: %" TCL_Z_MODIFIER "u\n",
 		i, count[i]);
 	p += strlen(p);
     }
-    sprintf(p, "number of buckets with %d or more entries: %" TCL_Z_MODIFIER "u\n",
+    snprintf(p, 60, "number of buckets with %d or more entries: %" TCL_Z_MODIFIER "u\n",
 	    NUM_COUNTERS, overflow);
     p += strlen(p);
-    sprintf(p, "average search distance for entry: %.1f", average);
+    snprintf(p, 60, "average search distance for entry: %.1f", average);
     return result;
 }
 #endif /*TCL_COMPILE_STATS*/
diff --git a/generic/tclOO.c b/generic/tclOO.c
index bee06e2..6afa06b 100644
--- a/generic/tclOO.c
+++ b/generic/tclOO.c
@@ -654,7 +654,7 @@ AllocObject(
     while (1) {
 	char objName[10 + TCL_INTEGER_SPACE];
 
-	sprintf(objName, "::oo::Obj%" TCL_Z_MODIFIER "u", ++fPtr->tsdPtr->nsCount);
+	snprintf(objName, sizeof(objName), "::oo::Obj%" TCL_Z_MODIFIER "u", ++fPtr->tsdPtr->nsCount);
 	oPtr->namespacePtr = Tcl_CreateNamespace(interp, objName, oPtr, NULL);
 	if (oPtr->namespacePtr != NULL) {
 	    creationEpoch = fPtr->tsdPtr->nsCount;
diff --git a/generic/tclOOBasic.c b/generic/tclOOBasic.c
index d8ef59b..1ad351d 100644
--- a/generic/tclOOBasic.c
+++ b/generic/tclOOBasic.c
@@ -52,7 +52,7 @@ AddConstructionFinalizer(
 
 static int
 FinalizeConstruction(
-    ClientData data[],
+    void *data[],
     Tcl_Interp *interp,
     int result)
 {
@@ -86,11 +86,12 @@ TclOO_Class_Constructor(
     Object *oPtr = (Object *) Tcl_ObjectContextObject(context);
     Tcl_Obj **invoke, *nameObj;
 
-    if (objc-1 > (int)Tcl_ObjectContextSkippedArgs(context)) {
-	Tcl_WrongNumArgs(interp, Tcl_ObjectContextSkippedArgs(context), objv,
+    size_t skip = Tcl_ObjectContextSkippedArgs(context);
+    if ((size_t)objc > skip + 1) {
+	Tcl_WrongNumArgs(interp, skip, objv,
 		"?definitionScript?");
 	return TCL_ERROR;
-    } else if (objc == (int)Tcl_ObjectContextSkippedArgs(context)) {
+    } else if ((size_t)objc == skip) {
 	return TCL_OK;
     }
 
@@ -135,7 +136,7 @@ TclOO_Class_Constructor(
 
 static int
 DecrRefsPostClassConstructor(
-    ClientData data[],
+    void *data[],
     Tcl_Interp *interp,
     int result)
 {
@@ -204,7 +205,7 @@ TclOO_Class_Create(
      * Check we have the right number of (sensible) arguments.
      */
 
-    if (objc - Tcl_ObjectContextSkippedArgs(context) < 1) {
+    if ((size_t)objc < 1 + Tcl_ObjectContextSkippedArgs(context)) {
 	Tcl_WrongNumArgs(interp, Tcl_ObjectContextSkippedArgs(context), objv,
 		"objectName ?arg ...?");
 	return TCL_ERROR;
@@ -269,7 +270,7 @@ TclOO_Class_CreateNs(
      * Check we have the right number of (sensible) arguments.
      */
 
-    if (objc - Tcl_ObjectContextSkippedArgs(context) < 2) {
+    if ((size_t)objc + 1 < Tcl_ObjectContextSkippedArgs(context) + 3) {
 	Tcl_WrongNumArgs(interp, Tcl_ObjectContextSkippedArgs(context), objv,
 		"objectName namespaceName ?arg ...?");
 	return TCL_ERROR;
@@ -393,7 +394,7 @@ TclOO_Object_Destroy(
 
 static int
 AfterNRDestructor(
-    ClientData data[],
+    void *data[],
     Tcl_Interp *interp,
     int result)
 {
@@ -427,12 +428,12 @@ TclOO_Object_Eval(
 {
     CallContext *contextPtr = (CallContext *) context;
     Tcl_Object object = Tcl_ObjectContextObject(context);
-    const int skip = Tcl_ObjectContextSkippedArgs(context);
+    size_t skip = Tcl_ObjectContextSkippedArgs(context);
     CallFrame *framePtr, **framePtrPtr = &framePtr;
     Tcl_Obj *scriptPtr;
     CmdFrame *invoker;
 
-    if (objc-1 < skip) {
+    if ((size_t)objc < skip + 1) {
 	Tcl_WrongNumArgs(interp, skip, objv, "arg ?arg ...?");
 	return TCL_ERROR;
     }
@@ -460,7 +461,7 @@ TclOO_Object_Eval(
      * object when it decrements its refcount after eval'ing it.
      */
 
-    if (objc != skip+1) {
+    if ((size_t)objc != skip+1) {
 	scriptPtr = Tcl_ConcatObj(objc-skip, objv+skip);
 	invoker = NULL;
     } else {
@@ -479,7 +480,7 @@ TclOO_Object_Eval(
 
 static int
 FinalizeEval(
-    ClientData data[],
+    void *data[],
     Tcl_Interp *interp,
     int result)
 {
@@ -531,7 +532,8 @@ TclOO_Object_Unknown(
     Class *callerCls = NULL;
     Object *oPtr = contextPtr->oPtr;
     const char **methodNames;
-    int numMethodNames, i, skip = Tcl_ObjectContextSkippedArgs(context);
+    int numMethodNames, i;
+    size_t skip = Tcl_ObjectContextSkippedArgs(context);
     CallFrame *framePtr = ((Interp *) interp)->varFramePtr;
     Tcl_Obj *errorMsg;
 
@@ -541,7 +543,7 @@ TclOO_Object_Unknown(
      * name without an error).
      */
 
-    if (objc < skip+1) {
+    if ((size_t)objc < skip+1) {
 	Tcl_WrongNumArgs(interp, skip, objv, "method ?arg ...?");
 	return TCL_ERROR;
     }
@@ -635,7 +637,7 @@ TclOO_Object_LinkVar(
     Interp *iPtr = (Interp *) interp;
     Tcl_Object object = Tcl_ObjectContextObject(context);
     Namespace *savedNsPtr;
-    int i;
+    size_t i;
 
     if ((size_t)objc < Tcl_ObjectContextSkippedArgs(context)) {
 	Tcl_WrongNumArgs(interp, Tcl_ObjectContextSkippedArgs(context), objv,
@@ -653,7 +655,7 @@ TclOO_Object_LinkVar(
 	return TCL_OK;
     }
 
-    for (i=Tcl_ObjectContextSkippedArgs(context) ; i<objc ; i++) {
+    for (i = Tcl_ObjectContextSkippedArgs(context) ; i < (size_t)objc ; i++) {
 	Var *varPtr, *aryPtr;
 	const char *varName = TclGetString(objv[i]);
 
@@ -1007,7 +1009,7 @@ TclOONextToObjCmd(
 
 static int
 NextRestoreFrame(
-    ClientData data[],
+    void *data[],
     Tcl_Interp *interp,
     int result)
 {
@@ -1016,7 +1018,7 @@ NextRestoreFrame(
 
     iPtr->varFramePtr = (CallFrame *)data[0];
     if (contextPtr != NULL) {
-	contextPtr->index = PTR2INT(data[2]);
+	contextPtr->index = PTR2UINT(data[2]);
     }
     return result;
 }
@@ -1090,7 +1092,7 @@ TclOOSelfObjCmd(
 	return TCL_OK;
     case SELF_NS:
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		contextPtr->oPtr->namespacePtr->fullName,-1));
+		contextPtr->oPtr->namespacePtr->fullName, TCL_INDEX_NONE));
 	return TCL_OK;
     case SELF_CLASS: {
 	Class *clsPtr = CurrentlyInvoked(contextPtr).mPtr->declaringClassPtr;
diff --git a/generic/tclOOInt.h b/generic/tclOOInt.h
index b7fb34d..29e3b13 100644
--- a/generic/tclOOInt.h
+++ b/generic/tclOOInt.h
@@ -46,7 +46,7 @@ typedef struct Method {
 				/* The type of method. If NULL, this is a
 				 * special flag record which is just used for
 				 * the setting of the flags field. */
-    size_t refCount;
+    Tcl_Size refCount;
     void *clientData;	/* Type-specific data. */
     Tcl_Obj *namePtr;		/* Name of the method. */
     struct Object *declaringObjectPtr;
@@ -83,7 +83,7 @@ typedef struct ProcedureMethod {
 				 * includes the argument definition and the
 				 * body bytecodes. */
     int flags;			/* Flags to control features. */
-    size_t refCount;
+    Tcl_Size refCount;
     void *clientData;
     TclOO_PmCDDeleteProc *deleteClientdataProc;
     TclOO_PmCDCloneProc *cloneClientdataProc;
@@ -149,9 +149,9 @@ typedef struct {
  */
 
 #define LIST_STATIC(listType_t) \
-    struct { size_t num; listType_t *list; }
+    struct { Tcl_Size num; listType_t *list; }
 #define LIST_DYNAMIC(listType_t) \
-    struct { size_t num, size; listType_t *list; }
+    struct { Tcl_Size num, size; listType_t *list; }
 
 /*
  * These types are needed in function arguments.
@@ -184,14 +184,14 @@ typedef struct Object {
     struct Class *classPtr;	/* This is non-NULL for all classes, and NULL
 				 *  for everything else. It points to the class
 				 *  structure. */
-    size_t refCount;		/* Number of strong references to this object.
+    Tcl_Size refCount;		/* Number of strong references to this object.
 				 * Note that there may be many more weak
 				 * references; this mechanism exists to
 				 * avoid Tcl_Preserve. */
     int flags;
-    size_t creationEpoch;		/* Unique value to make comparisons of objects
+    Tcl_Size creationEpoch;		/* Unique value to make comparisons of objects
 				 * easier. */
-    size_t epoch;			/* Per-object epoch, incremented when the way
+    Tcl_Size epoch;			/* Per-object epoch, incremented when the way
 				 * an object should resolve call chains is
 				 * changed. */
     Tcl_HashTable *metadataPtr;	/* Mapping from pointers to metadata type to
@@ -329,7 +329,7 @@ typedef struct Class {
  */
 
 typedef struct ThreadLocalData {
-    size_t nsCount;		/* Epoch counter is used for keeping
+    Tcl_Size nsCount;		/* Epoch counter is used for keeping
 				 * the values used in Tcl_Obj internal
 				 * representations sane. Must be thread-local
 				 * because Tcl_Objs can cross interpreter
@@ -353,7 +353,7 @@ typedef struct Foundation {
     Tcl_Namespace *helpersNs;	/* Namespace containing the commands that are
 				 * only valid when executing inside a
 				 * procedural method. */
-    size_t epoch;			/* Used to invalidate method chains when the
+    Tcl_Size epoch;			/* Used to invalidate method chains when the
 				 * class structure changes. */
     ThreadLocalData *tsdPtr;	/* Counter so we can allocate a unique
 				 * namespace to each object. */
@@ -387,16 +387,16 @@ struct MInvoke {
 };
 
 typedef struct CallChain {
-    size_t objectCreationEpoch;	/* The object's creation epoch. Note that the
+    Tcl_Size objectCreationEpoch;	/* The object's creation epoch. Note that the
 				 * object reference is not stored in the call
 				 * chain; it is in the call context. */
-    size_t objectEpoch;		/* Local (object structure) epoch counter
+    Tcl_Size objectEpoch;		/* Local (object structure) epoch counter
 				 * snapshot. */
-    size_t epoch;			/* Global (class structure) epoch counter
+    Tcl_Size epoch;			/* Global (class structure) epoch counter
 				 * snapshot. */
     int flags;			/* Assorted flags, see below. */
-    size_t refCount;		/* Reference count. */
-    size_t numChain;		/* Size of the call chain. */
+    Tcl_Size refCount;		/* Reference count. */
+    Tcl_Size numChain;		/* Size of the call chain. */
     struct MInvoke *chain;	/* Array of call chain entries. May point to
 				 * staticChain if the number of entries is
 				 * small. */
@@ -405,9 +405,9 @@ typedef struct CallChain {
 
 typedef struct CallContext {
     Object *oPtr;		/* The object associated with this call. */
-    size_t index;			/* Index into the call chain of the currently
+    Tcl_Size index;			/* Index into the call chain of the currently
 				 * executing method implementation. */
-    size_t skip;			/* Current number of arguments to skip; can
+    Tcl_Size skip;			/* Current number of arguments to skip; can
 				 * vary depending on whether it is a direct
 				 * method call or a continuation via the
 				 * [next] command. */
@@ -578,7 +578,7 @@ MODULE_SCOPE void	TclOOSetupVariableResolver(Tcl_Namespace *nsPtr);
 /*
  * A convenience macro for iterating through the lists used in the internal
  * memory management of objects.
- * REQUIRES DECLARATION: size_t i;
+ * REQUIRES DECLARATION: Tcl_Size i;
  */
 
 #define FOREACH(var,ary) \
@@ -590,7 +590,7 @@ MODULE_SCOPE void	TclOOSetupVariableResolver(Tcl_Namespace *nsPtr);
  * A variation where the array is an array of structs. There's no issue with
  * possible NULLs; every element of the array will be iterated over and the
  * varable set to a pointer to each of those elements in turn.
- * REQUIRES DECLARATION: size_t i;
+ * REQUIRES DECLARATION: Tcl_Size i;
  */
 
 #define FOREACH_STRUCT(var,ary) \
diff --git a/generic/tclObj.c b/generic/tclObj.c
index 16b9ca1..9d37fdc 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -346,6 +346,18 @@ typedef struct ResolvedCmdName {
 				 * structure can be freed when refCount
 				 * becomes zero. */
 } ResolvedCmdName;
+ 
+#ifdef TCL_MEM_DEBUG
+/* 
+ * Filler matches the value used for filling freed memory in tclCkalloc.
+ * On 32-bit systems, the ref counts do not cross 0x7fffffff. On 64-bit
+ * implementations, ref counts will never reach this value (unless explicitly
+ * incremented without actual references!)
+ */
+#define FREEDREFCOUNTFILLER \
+    (sizeof(objPtr->refCount) == 4 ? 0xe8e8e8e8 : 0xe8e8e8e8e8e8e8e8)
+#endif
+
 
 /*
  *-------------------------------------------------------------------------
@@ -1016,7 +1028,7 @@ TclDbDumpActiveObjects(
  *
  *	Called via the TclNewObj or TclDbNewObj macros when TCL_MEM_DEBUG is
  *	enabled. This function will initialize the members of a Tcl_Obj
- *	struct. Initilization would be done inline via the TclNewObj macro
+ *	struct. Initialization would be done inline via the TclNewObj macro
  *	when compiling without TCL_MEM_DEBUG.
  *
  * Results:
@@ -3157,7 +3169,7 @@ FreeBignum(
  *	None.
  *
  * Side effects:
- *	The destination object receies a copy of the source object
+ *	The destination object receives a copy of the source object
  *
  *----------------------------------------------------------------------
  */
@@ -3236,7 +3248,7 @@ UpdateStringOfBignum(
  *
  * Tcl_NewBignumObj --
  *
- *	Creates an initializes a bignum object.
+ *	Creates and initializes a bignum object.
  *
  * Results:
  *	Returns the newly created object.
@@ -3736,7 +3748,7 @@ Tcl_DbIncrRefCount(
     int line)			/* Line number in the source file; used for
 				 * debugging. */
 {
-    if (objPtr->refCount == 0x61616161) {
+    if (objPtr->refCount == FREEDREFCOUNTFILLER) {
 	fprintf(stderr, "file = %s, line = %d\n", file, line);
 	fflush(stderr);
 	Tcl_Panic("incrementing refCount of previously disposed object");
@@ -3809,7 +3821,7 @@ Tcl_DbDecrRefCount(
     int line)			/* Line number in the source file; used for
 				 * debugging. */
 {
-    if (objPtr->refCount == 0x61616161) {
+    if (objPtr->refCount == FREEDREFCOUNTFILLER) {
 	fprintf(stderr, "file = %s, line = %d\n", file, line);
 	fflush(stderr);
 	Tcl_Panic("decrementing refCount of previously disposed object");
@@ -3891,7 +3903,7 @@ Tcl_DbIsShared(
 #endif
 {
 #ifdef TCL_MEM_DEBUG
-    if (objPtr->refCount == 0x61616161) {
+    if (objPtr->refCount == FREEDREFCOUNTFILLER) {
 	fprintf(stderr, "file = %s, line = %d\n", file, line);
 	fflush(stderr);
 	Tcl_Panic("checking whether previously disposed object is shared");
@@ -4248,7 +4260,7 @@ Tcl_GetCommandFromObj(
  *	None.
  *
  * Side effects:
- *	The object's old internal rep is freed. It's string rep is not
+ *	The object's old internal rep is freed. Its string rep is not
  *	changed. The refcount in the Command structure is incremented to keep
  *	it from being freed if the command is later deleted until
  *	TclNRExecuteByteCode has a chance to recognize that it was deleted.
diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c
index 19c1b9d..bb66350 100644
--- a/generic/tclPathObj.c
+++ b/generic/tclPathObj.c
@@ -65,7 +65,7 @@ typedef struct {
 				 *  normPathPtr exists and is absolute. */
     int flags;			/* Flags to describe interpretation - see
 				 * below. */
-    ClientData nativePathPtr;	/* Native representation of this path, which
+    void *nativePathPtr;	/* Native representation of this path, which
 				 * is filesystem dependent. */
     size_t filesystemEpoch;	/* Used to ensure the path representation was
 				 * generated during the correct filesystem
@@ -1489,7 +1489,7 @@ MakePathFromNormalized(
 Tcl_Obj *
 Tcl_FSNewNativePath(
     const Tcl_Filesystem *fromFilesystem,
-    ClientData clientData)
+    void *clientData)
 {
     Tcl_Obj *pathPtr = NULL;
     FsPath *fsPathPtr;
@@ -1927,7 +1927,7 @@ Tcl_FSGetNormalizedPath(
  *---------------------------------------------------------------------------
  */
 
-ClientData
+void *
 Tcl_FSGetInternalRep(
     Tcl_Obj *pathPtr,
     const Tcl_Filesystem *fsPtr)
@@ -2074,7 +2074,7 @@ void
 TclFSSetPathDetails(
     Tcl_Obj *pathPtr,
     const Tcl_Filesystem *fsPtr,
-    ClientData clientData)
+    void *clientData)
 {
     FsPath *srcFsPathPtr;
 
@@ -2207,10 +2207,12 @@ SetFsPathFromAny(
     fsPathPtr = (FsPath *)Tcl_Alloc(sizeof(FsPath));
 
     if (transPtr == pathPtr) {
-        transPtr = Tcl_DuplicateObj(pathPtr);
-        fsPathPtr->filesystemEpoch = 0;
+	(void) Tcl_GetString(pathPtr);
+	TclFreeInternalRep(pathPtr);
+	transPtr = Tcl_DuplicateObj(pathPtr);
+	fsPathPtr->filesystemEpoch = 0;
     } else {
-        fsPathPtr->filesystemEpoch = TclFSEpoch();
+	fsPathPtr->filesystemEpoch = TclFSEpoch();
     }
     Tcl_IncrRefCount(transPtr);
     fsPathPtr->translatedPathPtr = transPtr;
@@ -2368,7 +2370,7 @@ UpdateStringOfFsPath(
 int
 TclNativePathInFilesystem(
     Tcl_Obj *pathPtr,
-    TCL_UNUSED(ClientData *))
+    TCL_UNUSED(void **))
 {
     /*
      * A special case is required to handle the empty path "". This is a valid
diff --git a/generic/tclPkg.c b/generic/tclPkg.c
index 132a219..989f133 100644
--- a/generic/tclPkg.c
+++ b/generic/tclPkg.c
@@ -96,15 +96,15 @@ static void		AddRequirementsToResult(Tcl_Interp *interp, int reqc,
 static void		AddRequirementsToDString(Tcl_DString *dstring,
 			    int reqc, Tcl_Obj *const reqv[]);
 static Package *	FindPackage(Tcl_Interp *interp, const char *name);
-static int		PkgRequireCore(ClientData data[], Tcl_Interp *interp, int result);
-static int		PkgRequireCoreFinal(ClientData data[], Tcl_Interp *interp, int result);
-static int		PkgRequireCoreCleanup(ClientData data[], Tcl_Interp *interp, int result);
-static int		PkgRequireCoreStep1(ClientData data[], Tcl_Interp *interp, int result);
-static int		PkgRequireCoreStep2(ClientData data[], Tcl_Interp *interp, int result);
-static int		TclNRPkgRequireProc(ClientData clientData, Tcl_Interp *interp, int reqc, Tcl_Obj *const reqv[]);
-static int		SelectPackage(ClientData data[], Tcl_Interp *interp, int result);
-static int		SelectPackageFinal(ClientData data[], Tcl_Interp *interp, int result);
-static int		TclNRPackageObjCmdCleanup(ClientData data[], Tcl_Interp *interp, int result);
+static int		PkgRequireCore(void *data[], Tcl_Interp *interp, int result);
+static int		PkgRequireCoreFinal(void *data[], Tcl_Interp *interp, int result);
+static int		PkgRequireCoreCleanup(void *data[], Tcl_Interp *interp, int result);
+static int		PkgRequireCoreStep1(void *data[], Tcl_Interp *interp, int result);
+static int		PkgRequireCoreStep2(void *data[], Tcl_Interp *interp, int result);
+static int		TclNRPkgRequireProc(void *clientData, Tcl_Interp *interp, int reqc, Tcl_Obj *const reqv[]);
+static int		SelectPackage(void *data[], Tcl_Interp *interp, int result);
+static int		SelectPackageFinal(void *data[], Tcl_Interp *interp, int result);
+static int		TclNRPackageObjCmdCleanup(void *data[], Tcl_Interp *interp, int result);
 
 /*
  * Helper macros.
@@ -225,7 +225,7 @@ Tcl_PkgProvideEx(
 
 static void
 PkgFilesCleanupProc(
-    ClientData clientData,
+    void *clientData,
     TCL_UNUSED(Tcl_Interp *))
 {
     PkgFiles *pkgFiles = (PkgFiles *) clientData;
@@ -442,7 +442,7 @@ Tcl_PkgRequireProc(
 
 static int
 TclNRPkgRequireProc(
-    ClientData clientData,
+    void *clientData,
     Tcl_Interp *interp,
     int reqc,
     Tcl_Obj *const reqv[])
@@ -457,12 +457,12 @@ TclNRPkgRequireProc(
 
 static int
 PkgRequireCore(
-    ClientData data[],
+    void *data[],
     Tcl_Interp *interp,
     TCL_UNUSED(int))
 {
     const char *name = (const char *)data[0];
-    int reqc = PTR2INT(data[1]);
+    int reqc = (int)PTR2INT(data[1]);
     Tcl_Obj **reqv = (Tcl_Obj **)data[2];
     int code = CheckAllRequirements(interp, reqc, reqv);
     Require *reqPtr;
@@ -488,14 +488,14 @@ PkgRequireCore(
 
 static int
 PkgRequireCoreStep1(
-    ClientData data[],
+    void *data[],
     Tcl_Interp *interp,
     TCL_UNUSED(int))
 {
     Tcl_DString command;
     char *script;
     Require *reqPtr = (Require *)data[0];
-    int reqc = PTR2INT(data[1]);
+    int reqc = (int)PTR2INT(data[1]);
     Tcl_Obj **const reqv = (Tcl_Obj **)data[2];
     const char *name = reqPtr->name /* Name of desired package. */;
 
@@ -547,12 +547,12 @@ PkgRequireCoreStep1(
 
 static int
 PkgRequireCoreStep2(
-    ClientData data[],
+    void *data[],
     Tcl_Interp *interp,
     int result)
 {
     Require *reqPtr = (Require *)data[0];
-    int reqc = PTR2INT(data[1]);
+    int reqc = (int)PTR2INT(data[1]);
     Tcl_Obj **const reqv = (Tcl_Obj **)data[2];
     const char *name = reqPtr->name; /* Name of desired package. */
 
@@ -582,12 +582,12 @@ PkgRequireCoreStep2(
 
 static int
 PkgRequireCoreFinal(
-    ClientData data[],
+    void *data[],
     Tcl_Interp *interp,
     TCL_UNUSED(int))
 {
     Require *reqPtr = (Require *)data[0];
-    int reqc = PTR2INT(data[1]), satisfies;
+    int reqc = (int)PTR2INT(data[1]), satisfies;
     Tcl_Obj **const reqv = (Tcl_Obj **)data[2];
     char *pkgVersionI;
     void *clientDataPtr = reqPtr->clientDataPtr;
@@ -634,7 +634,7 @@ PkgRequireCoreFinal(
 
 static int
 PkgRequireCoreCleanup(
-    ClientData data[],
+    void *data[],
     TCL_UNUSED(Tcl_Interp *),
     int result)
 {
@@ -644,7 +644,7 @@ PkgRequireCoreCleanup(
 
 static int
 SelectPackage(
-    ClientData data[],
+    void *data[],
     Tcl_Interp *interp,
     TCL_UNUSED(int))
 {
@@ -653,7 +653,7 @@ SelectPackage(
 				/* Internal rep. of versions */
     int availStable, satisfies;
     Require *reqPtr = (Require *)data[0];
-    int reqc = PTR2INT(data[1]);
+    int reqc = (int)PTR2INT(data[1]);
     Tcl_Obj **const reqv = (Tcl_Obj **)data[2];
     const char *name = reqPtr->name;
     Package *pkgPtr = reqPtr->pkgPtr;
@@ -847,12 +847,12 @@ SelectPackage(
 
 static int
 SelectPackageFinal(
-    ClientData data[],
+    void *data[],
     Tcl_Interp *interp,
     int result)
 {
     Require *reqPtr = (Require *)data[0];
-    int reqc = PTR2INT(data[1]);
+    int reqc = (int)PTR2INT(data[1]);
     Tcl_Obj **const reqv = (Tcl_Obj **)data[2];
     const char *name = reqPtr->name;
     char *versionToProvide = reqPtr->versionToProvide;
@@ -1053,7 +1053,7 @@ Tcl_PkgPresentEx(
  */
 int
 Tcl_PackageObjCmd(
-    ClientData clientData,
+    void *clientData,
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -1539,7 +1539,7 @@ TclNRPackageObjCmd(
 
 static int
 TclNRPackageObjCmdCleanup(
-    ClientData data[],
+    void *data[],
     TCL_UNUSED(Tcl_Interp *),
     int result)
 {
diff --git a/generic/tclPlatDecls.h b/generic/tclPlatDecls.h
index 10d3094..1c60bf8 100644
--- a/generic/tclPlatDecls.h
+++ b/generic/tclPlatDecls.h
@@ -151,7 +151,7 @@ extern "C" {
 EXTERN int		Tcl_MacOSXOpenVersionedBundleResources(
 				Tcl_Interp *interp, const char *bundleName,
 				const char *bundleVersion,
-				int hasResourceFile, size_t maxPathLen,
+				int hasResourceFile, Tcl_Size maxPathLen,
 				char *libraryPath);
 /* 2 */
 EXTERN void		Tcl_MacOSXNotifierAddRunLoopMode(
@@ -164,7 +164,7 @@ typedef struct TclPlatStubs {
     void *hooks;
 
     void (*reserved0)(void);
-    int (*tcl_MacOSXOpenVersionedBundleResources) (Tcl_Interp *interp, const char *bundleName, const char *bundleVersion, int hasResourceFile, size_t maxPathLen, char *libraryPath); /* 1 */
+    int (*tcl_MacOSXOpenVersionedBundleResources) (Tcl_Interp *interp, const char *bundleName, const char *bundleVersion, int hasResourceFile, Tcl_Size maxPathLen, char *libraryPath); /* 1 */
     void (*tcl_MacOSXNotifierAddRunLoopMode) (const void *runLoopMode); /* 2 */
     void (*tcl_WinConvertError) (unsigned errCode); /* 3 */
 } TclPlatStubs;
diff --git a/generic/tclPosixStr.c b/generic/tclPosixStr.c
index ecdf652..52d5f09 100644
--- a/generic/tclPosixStr.c
+++ b/generic/tclPosixStr.c
@@ -62,6 +62,9 @@ Tcl_ErrnoId(void)
 #if defined(EALREADY) && (!defined(EBUSY) || (EALREADY != EBUSY))
     case EALREADY: return "EALREADY";
 #endif
+#ifdef EBADCAT
+    case EBADCAT: return "EBADCAT";
+#endif
 #ifdef EBADE
     case EBADE: return "EBADE";
 #endif
@@ -74,9 +77,6 @@ Tcl_ErrnoId(void)
 #ifdef EBADMSG
     case EBADMSG: return "EBADMSG";
 #endif
-#ifdef ECANCELED
-    case ECANCELED: return "ECANCELED";
-#endif
 #ifdef EBADR
     case EBADR: return "EBADR";
 #endif
@@ -95,6 +95,12 @@ Tcl_ErrnoId(void)
 #ifdef EBUSY
     case EBUSY: return "EBUSY";
 #endif
+#ifdef ECANCELED
+    case ECANCELED: return "ECANCELED";
+#endif
+#ifdef ECASECLASH
+    case ECASECLASH: return "ECASECLASH";
+#endif
 #ifdef ECHILD
     case ECHILD: return "ECHILD";
 #endif
@@ -140,12 +146,18 @@ Tcl_ErrnoId(void)
 #ifdef EEXIST
     case EEXIST: return "EEXIST";
 #endif
+#ifdef EFAIL
+    case EFAIL: return "EFAIL";
+#endif
 #ifdef EFAULT
     case EFAULT: return "EFAULT";
 #endif
 #ifdef EFBIG
     case EFBIG: return "EFBIG";
 #endif
+#ifdef EFTYPE
+    case EFTYPE: return "EFTYPE";
+#endif
 #ifdef EHOSTDOWN
     case EHOSTDOWN: return "EHOSTDOWN";
 #endif
@@ -161,6 +173,9 @@ Tcl_ErrnoId(void)
 #ifdef EILSEQ
     case EILSEQ: return "EILSEQ";
 #endif
+#ifdef EINPROG
+    case EINPROG: return "EINPROG";
+#endif
 #ifdef EINPROGRESS
     case EINPROGRESS: return "EINPROGRESS";
 #endif
@@ -179,12 +194,9 @@ Tcl_ErrnoId(void)
 #ifdef EISDIR
     case EISDIR: return "EISDIR";
 #endif
-#ifdef EISNAME
+#ifdef EISNAM
     case EISNAM: return "EISNAM";
 #endif
-#ifdef ELBIN
-    case ELBIN: return "ELBIN";
-#endif
 #ifdef EL2HLT
     case EL2HLT: return "EL2HLT";
 #endif
@@ -197,6 +209,9 @@ Tcl_ErrnoId(void)
 #ifdef EL3RST
     case EL3RST: return "EL3RST";
 #endif
+#ifdef ELBIN
+    case ELBIN: return "ELBIN";
+#endif
 #ifdef ELIBACC
     case ELIBACC: return "ELIBACC";
 #endif
@@ -218,6 +233,9 @@ Tcl_ErrnoId(void)
 #if defined(ELOOP) && (!defined(ENOENT) || (ELOOP != ENOENT))
     case ELOOP: return "ELOOP";
 #endif
+#ifdef EMEDIUMTYPE
+    case EMEDIUMTYPE: return "EMEDIUMTYPE";
+#endif
 #ifdef EMFILE
     case EMFILE: return "EMFILE";
 #endif
@@ -236,9 +254,6 @@ Tcl_ErrnoId(void)
 #ifdef ENAVAIL
     case ENAVAIL: return "ENAVAIL";
 #endif
-#ifdef ENET
-    case ENET: return "ENET";
-#endif
 #ifdef ENETDOWN
     case ENETDOWN: return "ENETDOWN";
 #endif
@@ -251,6 +266,9 @@ Tcl_ErrnoId(void)
 #ifdef ENFILE
     case ENFILE: return "ENFILE";
 #endif
+#ifdef ENMFILE
+    case ENMFILE: return "ENMFILE";
+#endif
 #ifdef ENOANO
     case ENOANO: return "ENOANO";
 #endif
@@ -281,6 +299,9 @@ Tcl_ErrnoId(void)
 #ifdef ENOMEM
     case ENOMEM: return "ENOMEM";
 #endif
+#ifdef ENOMEDIUM
+    case ENOMEDIUM: return "ENOMEDIUM";
+#endif
 #ifdef ENOMSG
     case ENOMSG: return "ENOMSG";
 #endif
@@ -293,6 +314,9 @@ Tcl_ErrnoId(void)
 #ifdef ENOPROTOOPT
     case ENOPROTOOPT: return "ENOPROTOOPT";
 #endif
+#ifdef ENOSHARE
+    case ENOSHARE: return "ENOSHARE";
+#endif
 #ifdef ENOSPC
     case ENOSPC: return "ENOSPC";
 #endif
@@ -338,6 +362,9 @@ Tcl_ErrnoId(void)
 #ifdef ENOTUNIQ
     case ENOTUNIQ: return "ENOTUNIQ";
 #endif
+#ifdef ENWAIT
+    case ENWAIT: return "ENWAIT";
+#endif
 #ifdef ENXIO
     case ENXIO: return "ENXIO";
 #endif
@@ -404,6 +431,9 @@ Tcl_ErrnoId(void)
 #ifdef EREMOTERELEASE
     case EREMOTERELEASE: return "EREMOTERELEASE";
 #endif
+#ifdef ERESTART
+    case ERESTART: return "ERESTART";
+#endif
 #ifdef EROFS
     case EROFS: return "EROFS";
 #endif
@@ -519,34 +549,34 @@ Tcl_ErrnoMsg(
     case EAGAIN: return "resource temporarily unavailable";
 #endif
 #ifdef EALIGN
-    case EALIGN: return "EALIGN";
+    case EALIGN: return "alignment error";
 #endif
 #if defined(EALREADY) && (!defined(EBUSY) || (EALREADY != EBUSY))
     case EALREADY: return "operation already in progress";
 #endif
+#ifdef EBADCAT
+    case EBADCAT: return "bad message catalogue format";
+#endif
 #ifdef EBADE
-    case EBADE: return "bad exchange descriptor";
+    case EBADE: return "invalid exchange";
 #endif
 #ifdef EBADF
-    case EBADF: return "bad file number";
+    case EBADF: return "bad file descriptor";
 #endif
 #ifdef EBADFD
     case EBADFD: return "file descriptor in bad state";
 #endif
 #ifdef EBADMSG
-    case EBADMSG: return "not a data message";
-#endif
-#ifdef ECANCELED
-    case ECANCELED: return "operation canceled";
+    case EBADMSG: return "bad message";
 #endif
 #ifdef EBADR
-    case EBADR: return "bad request descriptor";
+    case EBADR: return "invalid request descriptor";
 #endif
 #ifdef EBADRPC
     case EBADRPC: return "RPC structure is bad";
 #endif
 #ifdef EBADRQC
-    case EBADRQC: return "bad request code";
+    case EBADRQC: return "invalid request code";
 #endif
 #ifdef EBADSLT
     case EBADSLT: return "invalid slot";
@@ -555,10 +585,16 @@ Tcl_ErrnoMsg(
     case EBFONT: return "bad font file format";
 #endif
 #ifdef EBUSY
-    case EBUSY: return "file busy";
+    case EBUSY: return "device or resource busy";
+#endif
+#ifdef ECANCELED
+    case ECANCELED: return "operation canceled";
+#endif
+#ifdef ECASECLASH
+    case ECASECLASH: return "filename exists with different case";
 #endif
 #ifdef ECHILD
-    case ECHILD: return "no children";
+    case ECHILD: return "no child processes";
 #endif
 #ifdef ECHRNG
     case ECHRNG: return "channel number out of range";
@@ -588,7 +624,7 @@ Tcl_ErrnoMsg(
     case EDIRTY: return "mounting a dirty fs w/o force";
 #endif
 #ifdef EDOM
-    case EDOM: return "math argument out of range";
+    case EDOM: return "numerical argument out of domain";
 #endif
 #ifdef EDOTDOT
     case EDOTDOT: return "cross mount point";
@@ -600,19 +636,25 @@ Tcl_ErrnoMsg(
     case EDUPPKG: return "duplicate package name";
 #endif
 #ifdef EEXIST
-    case EEXIST: return "file already exists";
+    case EEXIST: return "file exists";
+#endif
+#ifdef EFAIL
+    case EFAIL: return "cannot start operation";
 #endif
 #ifdef EFAULT
-    case EFAULT: return "bad address in system call argument";
+    case EFAULT: return "bad address";
 #endif
 #ifdef EFBIG
     case EFBIG: return "file too large";
 #endif
+#ifdef EFTYPE
+    case EFTYPE: return "inappropriate file type or format";
+#endif
 #ifdef EHOSTDOWN
     case EHOSTDOWN: return "host is down";
 #endif
 #ifdef EHOSTUNREACH
-    case EHOSTUNREACH: return "host is unreachable";
+    case EHOSTUNREACH: return "no route to host";
 #endif
 #if defined(EIDRM) && (!defined(EINPROGRESS) || (EIDRM != EINPROGRESS))
     case EIDRM: return "identifier removed";
@@ -621,7 +663,10 @@ Tcl_ErrnoMsg(
     case EINIT: return "initialization error";
 #endif
 #ifdef EILSEQ
-    case EILSEQ: return "illegal byte sequence";
+    case EILSEQ: return "invalid or incomplete multibyte or wide character";
+#endif
+#ifdef EINPROG
+    case EINPROG: return "asynchronous operation in progress";
 #endif
 #ifdef EINPROGRESS
     case EINPROGRESS: return "operation now in progress";
@@ -633,19 +678,16 @@ Tcl_ErrnoMsg(
     case EINVAL: return "invalid argument";
 #endif
 #ifdef EIO
-    case EIO: return "I/O error";
+    case EIO: return "input/output error";
 #endif
 #ifdef EISCONN
-    case EISCONN: return "socket is already connected";
+    case EISCONN: return "transport endpoint is already connected";
 #endif
 #ifdef EISDIR
-    case EISDIR: return "illegal operation on a directory";
+    case EISDIR: return "is a directory";
 #endif
-#ifdef EISNAME
-    case EISNAM: return "is a name file";
-#endif
-#ifdef ELBIN
-    case ELBIN: return "ELBIN";
+#ifdef EISNAM
+    case EISNAM: return "is a named type file";
 #endif
 #ifdef EL2HLT
     case EL2HLT: return "level 2 halted";
@@ -659,8 +701,11 @@ Tcl_ErrnoMsg(
 #ifdef EL3RST
     case EL3RST: return "level 3 reset";
 #endif
+#ifdef ELBIN
+    case ELBIN: return "inode is remote";
+#endif
 #ifdef ELIBACC
-    case ELIBACC: return "cannot access a needed shared library";
+    case ELIBACC: return "can not access a needed shared library";
 #endif
 #ifdef ELIBBAD
     case ELIBBAD: return "accessing a corrupted shared library";
@@ -670,7 +715,7 @@ Tcl_ErrnoMsg(
 #endif
 #if defined(ELIBMAX) && (!defined(ECANCELED) || (ELIBMAX != ECANCELED))
     case ELIBMAX: return
-	    "attempting to link in more shared libraries than system limit";
+	    "attempting to link in too many shared libraries";
 #endif
 #ifdef ELIBSCN
     case ELIBSCN: return ".lib section in a.out corrupted";
@@ -681,6 +726,9 @@ Tcl_ErrnoMsg(
 #if defined(ELOOP) && (!defined(ENOENT) || (ELOOP != ENOENT))
     case ELOOP: return "too many levels of symbolic links";
 #endif
+#ifdef EMEDIUMTYPE
+    case EMEDIUMTYPE: return "wrong medium type";
+#endif
 #ifdef EMFILE
     case EMFILE: return "too many open files";
 #endif
@@ -699,9 +747,6 @@ Tcl_ErrnoMsg(
 #ifdef ENAVAIL
     case ENAVAIL: return "not available";
 #endif
-#ifdef ENET
-    case ENET: return "ENET";
-#endif
 #ifdef ENETDOWN
     case ENETDOWN: return "network is down";
 #endif
@@ -712,10 +757,13 @@ Tcl_ErrnoMsg(
     case ENETUNREACH: return "network is unreachable";
 #endif
 #ifdef ENFILE
-    case ENFILE: return "file table overflow";
+    case ENFILE: return "too many open files in system";
+#endif
+#ifdef ENMFILE
+    case ENMFILE: return "no more files";
 #endif
 #ifdef ENOANO
-    case ENOANO: return "anode table overflow";
+    case ENOANO: return "no anode";
 #endif
 #if defined(ENOBUFS) && (!defined(ENOSR) || (ENOBUFS != ENOSR))
     case ENOBUFS: return "no buffer space available";
@@ -742,7 +790,10 @@ Tcl_ErrnoMsg(
     case ENOLINK: return "link has been severed";
 #endif
 #ifdef ENOMEM
-    case ENOMEM: return "not enough memory";
+    case ENOMEM: return "cannot allocate memory";
+#endif
+#ifdef ENOMEDIUM
+    case ENOMEDIUM: return "no medium found";
 #endif
 #ifdef ENOMSG
     case ENOMSG: return "no message of desired type";
@@ -754,16 +805,19 @@ Tcl_ErrnoMsg(
     case ENOPKG: return "package not installed";
 #endif
 #ifdef ENOPROTOOPT
-    case ENOPROTOOPT: return "bad protocol option";
+    case ENOPROTOOPT: return "protocol not available";
+#endif
+#ifdef ENOSHARE
+    case ENOSHARE: return "no such host or network path";
 #endif
 #ifdef ENOSPC
     case ENOSPC: return "no space left on device";
 #endif
 #if defined(ENOSR) && (!defined(ENAMETOOLONG) || (ENAMETOOLONG != ENOSR))
-    case ENOSR: return "out of stream resources";
+    case ENOSR: return "out of streams resources";
 #endif
 #if defined(ENOSTR) && (!defined(ENOTTY) || (ENOTTY != ENOSTR))
-    case ENOSTR: return "not a stream device";
+    case ENOSTR: return "device not a stream";
 #endif
 #ifdef ENOSYM
     case ENOSYM: return "unresolved symbol name";
@@ -775,10 +829,7 @@ Tcl_ErrnoMsg(
     case ENOTBLK: return "block device required";
 #endif
 #ifdef ENOTCONN
-    case ENOTCONN: return "socket is not connected";
-#endif
-#ifdef ENOTRECOVERABLE
-    case ENOTRECOVERABLE: return "state not recoverable";
+    case ENOTCONN: return "transport endpoint is not connected";
 #endif
 #ifdef ENOTDIR
     case ENOTDIR: return "not a directory";
@@ -789,6 +840,9 @@ Tcl_ErrnoMsg(
 #ifdef ENOTNAM
     case ENOTNAM: return "not a name file";
 #endif
+#ifdef ENOTRECOVERABLE
+    case ENOTRECOVERABLE: return "state not recoverable";
+#endif
 #ifdef ENOTSOCK
     case ENOTSOCK: return "socket operation on non-socket";
 #endif
@@ -796,11 +850,14 @@ Tcl_ErrnoMsg(
     case ENOTSUP: return "operation not supported";
 #endif
 #ifdef ENOTTY
-    case ENOTTY: return "inappropriate device for ioctl";
+    case ENOTTY: return "inappropriate ioctl for device";
 #endif
 #ifdef ENOTUNIQ
     case ENOTUNIQ: return "name not unique on network";
 #endif
+#ifdef ENWAIT
+    case ENWAIT: return "No waiting processes";
+#endif
 #ifdef ENXIO
     case ENXIO: return "no such device or address";
 #endif
@@ -811,13 +868,13 @@ Tcl_ErrnoMsg(
     case EOTHER: return "other error";
 #endif
 #if defined(EOVERFLOW) && (!defined(EFBIG) || (EOVERFLOW != EFBIG)) && (!defined(EINVAL) || (EOVERFLOW != EINVAL))
-    case EOVERFLOW: return "file too big";
+    case EOVERFLOW: return "value too large for defined data type";
 #endif
 #ifdef EOWNERDEAD
     case EOWNERDEAD: return "owner died";
 #endif
 #ifdef EPERM
-    case EPERM: return "not owner";
+    case EPERM: return "operation not permitted";
 #endif
 #if defined(EPFNOSUPPORT) && (!defined(ENOLCK) || (ENOLCK != EPFNOSUPPORT))
     case EPFNOSUPPORT: return "protocol family not supported";
@@ -847,10 +904,10 @@ Tcl_ErrnoMsg(
     case EPROTOTYPE: return "protocol wrong type for socket";
 #endif
 #ifdef ERANGE
-    case ERANGE: return "math result unrepresentable";
+    case ERANGE: return "numerical result out of range";
 #endif
 #if defined(EREFUSED) && (!defined(ECONNREFUSED) || (EREFUSED != ECONNREFUSED))
-    case EREFUSED: return "EREFUSED";
+    case EREFUSED: return "connection refused";
 #endif
 #ifdef EREMCHG
     case EREMCHG: return "remote address changed";
@@ -859,13 +916,16 @@ Tcl_ErrnoMsg(
     case EREMDEV: return "remote device";
 #endif
 #ifdef EREMOTE
-    case EREMOTE: return "pathname hit remote file system";
+    case EREMOTE: return "object is remote";
 #endif
 #ifdef EREMOTEIO
-    case EREMOTEIO: return "remote i/o error";
+    case EREMOTEIO: return "remote I/O error";
 #endif
 #ifdef EREMOTERELEASE
-    case EREMOTERELEASE: return "EREMOTERELEASE";
+    case EREMOTERELEASE: return "remote peer released connection";
+#endif
+#ifdef ERESTART
+    case ERESTART: return "interrupted system call should be restarted";
 #endif
 #ifdef EROFS
     case EROFS: return "read-only file system";
@@ -877,13 +937,13 @@ Tcl_ErrnoMsg(
     case ERREMOTE: return "object is remote";
 #endif
 #ifdef ESHUTDOWN
-    case ESHUTDOWN: return "cannot send after socket shutdown";
+    case ESHUTDOWN: return "cannot send after transport endpoint shutdown";
 #endif
 #ifdef ESOCKTNOSUPPORT
     case ESOCKTNOSUPPORT: return "socket type not supported";
 #endif
 #ifdef ESPIPE
-    case ESPIPE: return "invalid seek";
+    case ESPIPE: return "illegal seek";
 #endif
 #ifdef ESRCH
     case ESRCH: return "no such process";
@@ -892,10 +952,13 @@ Tcl_ErrnoMsg(
     case ESRMNT: return "srmount error";
 #endif
 #ifdef ESTALE
-    case ESTALE: return "stale remote file handle";
+    case ESTALE: return "stale file handle";
+#endif
+#ifdef ESTRPIPE
+    case ESTRPIPE: return "streams pipe error";
 #endif
 #ifdef ESUCCESS
-    case ESUCCESS: return "Error 0";
+    case ESUCCESS: return "success";
 #endif
 #if defined(ETIME) && (!defined(ELOOP) || (ETIME != ELOOP))
     case ETIME: return "timer expired";
@@ -907,7 +970,7 @@ Tcl_ErrnoMsg(
     case ETOOMANYREFS: return "too many references: cannot splice";
 #endif
 #ifdef ETXTBSY
-    case ETXTBSY: return "text file or pseudo-device busy";
+    case ETXTBSY: return "text file busy";
 #endif
 #ifdef EUCLEAN
     case EUCLEAN: return "structure needs cleaning";
@@ -925,10 +988,10 @@ Tcl_ErrnoMsg(
     case EWOULDBLOCK: return "operation would block";
 #endif
 #ifdef EXDEV
-    case EXDEV: return "cross-domain link";
+    case EXDEV: return "invalid cross-device link";
 #endif
 #ifdef EXFULL
-    case EXFULL: return "message tables full";
+    case EXFULL: return "exchange full";
 #endif
     default:
 #ifdef NO_STRERROR
diff --git a/generic/tclPreserve.c b/generic/tclPreserve.c
index 5bc0a1a..ff4b45b 100644
--- a/generic/tclPreserve.c
+++ b/generic/tclPreserve.c
@@ -21,7 +21,7 @@
  */
 
 typedef struct {
-    ClientData clientData;	/* Address of preserved block. */
+    void *clientData;	/* Address of preserved block. */
     size_t refCount;		/* Number of Tcl_Preserve calls in effect for
 				 * block. */
     int mustFree;		/* Non-zero means Tcl_EventuallyFree was
@@ -117,7 +117,7 @@ TclFinalizePreserve(void)
 
 void
 Tcl_Preserve(
-    ClientData clientData)	/* Pointer to malloc'ed block of memory. */
+    void *clientData)	/* Pointer to malloc'ed block of memory. */
 {
     Reference *refPtr;
     size_t i;
@@ -180,7 +180,7 @@ Tcl_Preserve(
 
 void
 Tcl_Release(
-    ClientData clientData)	/* Pointer to malloc'ed block of memory. */
+    void *clientData)	/* Pointer to malloc'ed block of memory. */
 {
     Reference *refPtr;
     size_t i;
@@ -259,7 +259,7 @@ Tcl_Release(
 
 void
 Tcl_EventuallyFree(
-    ClientData clientData,	/* Pointer to malloc'ed block of memory. */
+    void *clientData,	/* Pointer to malloc'ed block of memory. */
     Tcl_FreeProc *freeProc)	/* Function to actually do free. */
 {
     Reference *refPtr;
diff --git a/generic/tclProc.c b/generic/tclProc.c
index c8a304a..a472a2d 100644
--- a/generic/tclProc.c
+++ b/generic/tclProc.c
@@ -1298,7 +1298,7 @@ InitLocalCache(
 	    *namePtr = NULL;
 	} else {
 	    *namePtr = TclCreateLiteral(iPtr, localPtr->name,
-		    localPtr->nameLength, /* hash */ (size_t) -1,
+		    localPtr->nameLength, /* hash */ TCL_INDEX_NONE,
 		    &isNew, /* nsPtr */ NULL, 0, NULL);
 	    Tcl_IncrRefCount(*namePtr);
 	}
diff --git a/generic/tclRegexp.c b/generic/tclRegexp.c
index 07beffd..35f6334 100644
--- a/generic/tclRegexp.c
+++ b/generic/tclRegexp.c
@@ -730,7 +730,7 @@ TclRegError(
     p = (n > sizeof(buf)) ? "..." : "";
     Tcl_SetObjResult(interp, Tcl_ObjPrintf("%s%s%s", msg, buf, p));
 
-    sprintf(cbuf, "%d", status);
+    snprintf(cbuf, sizeof(cbuf), "%d", status);
     (void) TclReError(REG_ITOA, cbuf, sizeof(cbuf));
     Tcl_SetErrorCode(interp, "REGEXP", cbuf, buf, NULL);
 }
diff --git a/generic/tclStrToD.c b/generic/tclStrToD.c
index 2f29617..5d2efc7 100644
--- a/generic/tclStrToD.c
+++ b/generic/tclStrToD.c
@@ -5273,7 +5273,7 @@ TclFormatNaN(
     *buffer++ = 'N';
     bitwhack.iv &= ((UINT64_C(1)) << 51) - 1;
     if (bitwhack.iv != 0) {
-	sprintf(buffer, "(%" PRIx64 ")", bitwhack.iv);
+	snprintf(buffer, TCL_DOUBLE_SPACE, "(%" PRIx64 ")", bitwhack.iv);
     } else {
 	*buffer = '\0';
     }
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index 0acc6e2..959a221 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -2481,14 +2481,14 @@ Tcl_AppendFormatToObj(
 		*p++ = '+';
 	    }
 	    if (width) {
-		p += sprintf(p, "%d", width);
+		p += snprintf(p, TCL_INTEGER_SPACE, "%d", width);
 		if (width > length) {
 		    length = width;
 		}
 	    }
 	    if (gotPrecision) {
 		*p++ = '.';
-		p += sprintf(p, "%d", precision);
+		p += snprintf(p, TCL_INTEGER_SPACE, "%d", precision);
 		if (precision > INT_MAX - length) {
 		    msg = overflow;
 		    errCode = "OVERFLOW";
@@ -2512,7 +2512,7 @@ Tcl_AppendFormatToObj(
 		goto errorMsg;
 	    }
 	    bytes = TclGetString(segment);
-	    if (!Tcl_AttemptSetObjLength(segment, sprintf(bytes, spec, d))) {
+	    if (!Tcl_AttemptSetObjLength(segment, snprintf(bytes, segment->length, spec, d))) {
 		msg = overflow;
 		errCode = "OVERFLOW";
 		goto errorMsg;
@@ -2960,13 +2960,11 @@ TclStringRepeat(
 	/* Result will be pure byte array. Pre-size it */
 	(void)Tcl_GetByteArrayFromObj(objPtr, &length);
 	maxCount = TCL_SIZE_SMAX;
-    }
-    else if (unichar) {
+    } else if (unichar) {
 	/* Result will be pure Tcl_UniChar array. Pre-size it. */
 	(void)Tcl_GetUnicodeFromObj(objPtr, &length);
 	maxCount = TCL_SIZE_SMAX/sizeof(Tcl_UniChar);
-    }
-    else {
+    } else {
 	/* Result will be concat of string reps. Pre-size it. */
 	(void)Tcl_GetStringFromObj(objPtr, &length);
 	maxCount = TCL_SIZE_SMAX;
@@ -4168,7 +4166,7 @@ TclStringReplace(
  * FillUnicodeRep --
  *
  *	Populate the Unicode internal rep with the Unicode form of its string
- *	rep. The object must alread have a "String" internal rep.
+ *	rep. The object must already have a "String" internal rep.
  *
  * Results:
  *	None.
@@ -4318,7 +4316,7 @@ DupStringInternalRep(
  *	This operation always succeeds and returns TCL_OK.
  *
  * Side effects:
- *	Any old internal reputation for objPtr is freed and the internal
+ *	Any old internal representation for objPtr is freed and the internal
  *	representation is set to "String".
  *
  *----------------------------------------------------------------------
diff --git a/generic/tclTest.c b/generic/tclTest.c
index 06d5064..e42d5e6 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -1166,7 +1166,6 @@ CmdProc1(
     return TCL_OK;
 }
 
-
 static int
 CmdProc2(
     void *clientData,	/* String to return. */
@@ -1243,8 +1242,8 @@ TestcmdtokenCmd(
     const char **argv)		/* Argument strings. */
 {
     TestCommandTokenRef *refPtr;
-    char buf[30];
     int id;
+    char buf[30];
 
     if (argc != 3) {
 	Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
@@ -1260,7 +1259,7 @@ TestcmdtokenCmd(
 	nextCommandTokenRefId++;
 	refPtr->nextPtr = firstCommandTokenRef;
 	firstCommandTokenRef = refPtr;
-	sprintf(buf, "%d", refPtr->id);
+	snprintf(buf, sizeof(buf), "%d", refPtr->id);
 	Tcl_AppendResult(interp, buf, NULL);
     } else {
 	if (sscanf(argv[2], "%d", &id) != 1) {
@@ -1980,6 +1979,237 @@ static void SpecialFree(
 }
 
 /*
+ *------------------------------------------------------------------------
+ *
+ * UtfTransformFn --
+ *
+ *    Implements a direct call into Tcl_UtfToExternal and Tcl_ExternalToUtf
+ *    as otherwise there is no script level command that directly exercises
+ *    these functions (i/o command cannot test all combinations)
+ *    The arguments at the script level are roughly those of the above
+ *    functions:
+ *        encodingname srcbytes flags state dstlen ?srcreadvar? ?dstwrotevar? ?dstcharsvar?
+ *
+ * Results:
+ *    TCL_OK or TCL_ERROR. This any errors running the test, NOT the
+ *    result of Tcl_UtfToExternal or Tcl_ExternalToUtf.
+ *
+ * Side effects:
+ *
+ *    The result in the interpreter is a list of the return code from the
+ *    Tcl_UtfToExternal/Tcl_ExternalToUtf functions, the encoding state, and
+ *    an encoded binary string of length dstLen. Note the string is the
+ *    entire output buffer, not just the part containing the decoded
+ *    portion. This allows for additional checks at test script level.
+ *
+ *    If any of the srcreadvar, dstwrotevar and
+ *    dstcharsvar are specified and not empty, they are treated as names
+ *    of variables where the *srcRead, *dstWrote and *dstChars output
+ *    from the functions are stored.
+ *
+ *    The function also checks internally whether nuls are correctly
+ *    appended as requested but the TCL_ENCODING_NO_TERMINATE flag
+ *    and that no buffer overflows occur.
+ *------------------------------------------------------------------------
+ */
+typedef int
+UtfTransformFn(Tcl_Interp *interp, Tcl_Encoding encoding, const char *src, Tcl_Size srcLen, int flags, Tcl_EncodingState *statePtr,
+               char *dst, Tcl_Size dstLen, int *srcReadPtr, int *dstWrotePtr, int *dstCharsPtr);
+static int UtfExtWrapper(
+    Tcl_Interp *interp, UtfTransformFn *transformer, int objc, Tcl_Obj *const objv[])
+{
+    Tcl_Encoding encoding;
+    Tcl_EncodingState encState, *encStatePtr;
+    Tcl_Size srcLen, bufLen;
+    const unsigned char *bytes;
+    unsigned char *bufPtr;
+    int srcRead, dstLen, dstWrote, dstChars;
+    Tcl_Obj *srcReadVar, *dstWroteVar, *dstCharsVar;
+    int result;
+    int flags;
+    Tcl_Obj **flagObjs;
+    int nflags;
+    static const struct {
+	const char *flagKey;
+	int flag;
+    } flagMap[] = {
+	{"start", TCL_ENCODING_START},
+	{"end", TCL_ENCODING_END},
+	{"stoponerror", TCL_ENCODING_STOPONERROR},
+	{"noterminate", TCL_ENCODING_NO_TERMINATE},
+	{"charlimit", TCL_ENCODING_CHAR_LIMIT},
+	{"profiletcl8", TCL_ENCODING_PROFILE_TCL8},
+	{"profilestrict", TCL_ENCODING_PROFILE_STRICT},
+	{"profilereplace", TCL_ENCODING_PROFILE_REPLACE},
+	{NULL, 0}
+    };
+    int i;
+    Tcl_WideInt wide;
+
+    if (objc < 7 || objc > 10) {
+        Tcl_WrongNumArgs(interp,
+                         2,
+                         objv,
+                         "encoding srcbytes flags state dstlen ?srcreadvar? ?dstwrotevar? ?dstcharsvar?");
+        return TCL_ERROR;
+    }
+    if (Tcl_GetEncodingFromObj(interp, objv[2], &encoding) != TCL_OK) {
+        return TCL_ERROR;
+    }
+
+    /* Flags may be specified as list of integers and keywords */
+    flags = 0;
+    if (Tcl_ListObjGetElements(interp, objv[4], &nflags, &flagObjs) != TCL_OK) {
+	return TCL_ERROR;
+    }
+
+    for (i = 0; i < nflags; ++i) {
+	int flag;
+	if (Tcl_GetIntFromObj(NULL, flagObjs[i], &flag) == TCL_OK) {
+	    flags |= flag;
+	} else {
+	    int idx;
+	    if (Tcl_GetIndexFromObjStruct(interp,
+					  flagObjs[i],
+					  flagMap,
+					  sizeof(flagMap[0]),
+					  "flag",
+					  0,
+					  &idx) != TCL_OK) {
+		return TCL_ERROR;
+	    }
+	    flags |= flagMap[idx].flag;
+	}
+    }
+
+    /* Assumes state is integer if not "" */
+    if (Tcl_GetWideIntFromObj(interp, objv[5], &wide) == TCL_OK) {
+        encState = (Tcl_EncodingState)(size_t)wide;
+        encStatePtr = &encState;
+    } else if (Tcl_GetCharLength(objv[5]) == 0) {
+        encStatePtr = NULL;
+    } else {
+        return TCL_ERROR;
+    }
+
+    if (Tcl_GetIntFromObj(interp, objv[6], &dstLen) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    srcReadVar = NULL;
+    dstWroteVar = NULL;
+    dstCharsVar = NULL;
+    if (objc > 7) {
+	/* Has caller requested srcRead? */
+	if (Tcl_GetCharLength(objv[7])) {
+	    srcReadVar = objv[7];
+	}
+	if (objc > 8) {
+	    /* Ditto for dstWrote */
+            if (Tcl_GetCharLength(objv[8])) {
+                dstWroteVar = objv[8];
+            }
+	    if (objc > 9) {
+                if (Tcl_GetCharLength(objv[9])) {
+                    dstCharsVar = objv[9];
+		}
+	    }
+	}
+    }
+    if (flags & TCL_ENCODING_CHAR_LIMIT) {
+	/* Caller should have specified the dest char limit */
+	Tcl_Obj *valueObj;
+	if (dstCharsVar == NULL ||
+	    (valueObj = Tcl_ObjGetVar2(interp, dstCharsVar, NULL, 0)) == NULL
+	) {
+	    Tcl_SetResult(interp,
+			 "dstCharsVar must be specified with integer value if "
+			 "TCL_ENCODING_CHAR_LIMIT set in flags.", TCL_STATIC);
+	    return TCL_ERROR;
+	}
+	if (Tcl_GetIntFromObj(interp, valueObj, &dstChars) != TCL_OK) {
+	    return TCL_ERROR;
+	}
+    } else {
+	dstChars = 0; /* Only used for output */
+    }
+
+    bufLen = dstLen + 4; /* 4 -> overflow detection */
+    bufPtr = (unsigned char *) Tcl_Alloc(bufLen);
+    memset(bufPtr, 0xFF, dstLen); /* Need to check nul terminator */
+    memmove(bufPtr + dstLen, "\xAB\xCD\xEF\xAB", 4);   /* overflow detection */
+    bytes = Tcl_GetByteArrayFromObj(objv[3], &srcLen); /* Last! to avoid shimmering */
+    result = (*transformer)(interp, encoding, (const char *)bytes, srcLen, flags,
+                            encStatePtr, (char *) bufPtr, dstLen,
+                            srcReadVar ? &srcRead : NULL,
+                            &dstWrote,
+                            dstCharsVar ? &dstChars : NULL);
+    if (memcmp(bufPtr + bufLen - 4, "\xAB\xCD\xEF\xAB", 4)) {
+        Tcl_SetResult(interp,
+                      "Tcl_ExternalToUtf wrote past output buffer",
+                      TCL_STATIC);
+        result = TCL_ERROR;
+    } else if (result != TCL_ERROR) {
+        Tcl_Obj *resultObjs[3];
+        switch (result) {
+        case TCL_OK:
+            resultObjs[0] = Tcl_NewStringObj("ok", TCL_INDEX_NONE);
+            break;
+        case TCL_CONVERT_MULTIBYTE:
+            resultObjs[0] = Tcl_NewStringObj("multibyte", TCL_INDEX_NONE);
+            break;
+        case TCL_CONVERT_SYNTAX:
+            resultObjs[0] = Tcl_NewStringObj("syntax", TCL_INDEX_NONE);
+            break;
+        case TCL_CONVERT_UNKNOWN:
+            resultObjs[0] = Tcl_NewStringObj("unknown", TCL_INDEX_NONE);
+            break;
+        case TCL_CONVERT_NOSPACE:
+            resultObjs[0] = Tcl_NewStringObj("nospace", TCL_INDEX_NONE);
+            break;
+        default:
+            resultObjs[0] = Tcl_NewIntObj(result);
+            break;
+        }
+        result = TCL_OK;
+        resultObjs[1] =
+            encStatePtr ? Tcl_NewWideIntObj((Tcl_WideInt)(size_t)encState) : Tcl_NewObj();
+        resultObjs[2] = Tcl_NewByteArrayObj(bufPtr, dstLen);
+        if (srcReadVar) {
+	    if (Tcl_ObjSetVar2(interp,
+			       srcReadVar,
+			       NULL,
+			       Tcl_NewIntObj(srcRead),
+			       TCL_LEAVE_ERR_MSG) == NULL) {
+		result = TCL_ERROR;
+	    }
+	}
+        if (dstWroteVar) {
+	    if (Tcl_ObjSetVar2(interp,
+			       dstWroteVar,
+			       NULL,
+			       Tcl_NewIntObj(dstWrote),
+			       TCL_LEAVE_ERR_MSG) == NULL) {
+		result = TCL_ERROR;
+	    }
+	}
+        if (dstCharsVar) {
+	    if (Tcl_ObjSetVar2(interp,
+			       dstCharsVar,
+			       NULL,
+			       Tcl_NewIntObj(dstChars),
+			       TCL_LEAVE_ERR_MSG) == NULL) {
+		result = TCL_ERROR;
+	    }
+	}
+        Tcl_SetObjResult(interp, Tcl_NewListObj(3, resultObjs));
+    }
+
+    Tcl_Free(bufPtr);
+    Tcl_FreeEncoding(encoding); /* Free returned reference */
+    return result;
+}
+
+/*
  *----------------------------------------------------------------------
  *
  * TestencodingCmd --
@@ -2008,10 +2238,10 @@ TestencodingObjCmd(
     const char *string;
     TclEncoding *encodingPtr;
     static const char *const optionStrings[] = {
-	"create", "delete", "nullength", NULL
+	"create", "delete", "nullength", "Tcl_ExternalToUtf", "Tcl_UtfToExternal", NULL
     };
     enum options {
-	ENC_CREATE, ENC_DELETE, ENC_NULLENGTH
+	ENC_CREATE, ENC_DELETE, ENC_NULLENGTH, ENC_EXTTOUTF, ENC_UTFTOEXT
     } index;
 
     if (objc < 2) {
@@ -2032,7 +2262,7 @@ TestencodingObjCmd(
 	    Tcl_WrongNumArgs(interp, 2, objv, "name toutfcmd fromutfcmd");
 	    return TCL_ERROR;
 	}
-	encodingPtr = (TclEncoding*)Tcl_Alloc(sizeof(TclEncoding));
+	encodingPtr = (TclEncoding *)Tcl_Alloc(sizeof(TclEncoding));
 	encodingPtr->interp = interp;
 
 	string = Tcl_GetStringFromObj(objv[3], &length);
@@ -2080,6 +2310,11 @@ TestencodingObjCmd(
 	Tcl_SetObjResult(interp,
 			 Tcl_NewIntObj(Tcl_GetEncodingNulLength(encoding)));
 	Tcl_FreeEncoding(encoding);
+        break;
+    case ENC_EXTTOUTF:
+        return UtfExtWrapper(interp,Tcl_ExternalToUtf,objc,objv);
+    case ENC_UTFTOEXT:
+        return UtfExtWrapper(interp,Tcl_UtfToExternal,objc,objv);
     }
     return TCL_OK;
 }
@@ -2487,7 +2722,7 @@ ExitProcOdd(
     char buf[16 + TCL_INTEGER_SPACE];
     int len;
 
-    sprintf(buf, "odd %d\n", (int)PTR2INT(clientData));
+    snprintf(buf, sizeof(buf), "odd %d\n", (int)PTR2INT(clientData));
     len = strlen(buf);
     if (len != (int) write(1, buf, len)) {
 	Tcl_Panic("ExitProcOdd: unable to write to stdout");
@@ -2501,7 +2736,7 @@ ExitProcEven(
     char buf[16 + TCL_INTEGER_SPACE];
     int len;
 
-    sprintf(buf, "even %d\n", (int)PTR2INT(clientData));
+    snprintf(buf, sizeof(buf), "even %d\n", (int)PTR2INT(clientData));
     len = strlen(buf);
     if (len != (int) write(1, buf, len)) {
 	Tcl_Panic("ExitProcEven: unable to write to stdout");
@@ -2546,7 +2781,7 @@ TestexprlongCmd(
     if (result != TCL_OK) {
 	return result;
     }
-    sprintf(buf, ": %ld", exprResult);
+    snprintf(buf, sizeof(buf), ": %ld", exprResult);
     Tcl_AppendResult(interp, buf, NULL);
     return TCL_OK;
 }
@@ -2588,7 +2823,7 @@ TestexprlongobjCmd(
     if (result != TCL_OK) {
 	return result;
     }
-    sprintf(buf, ": %ld", exprResult);
+    snprintf(buf, sizeof(buf), ": %ld", exprResult);
     Tcl_AppendResult(interp, buf, NULL);
     return TCL_OK;
 }
@@ -4262,7 +4497,7 @@ TestregexpObjCmd(
 
 	    varName = Tcl_GetString(objv[2]);
 	    TclRegExpRangeUniChar(regExpr, TCL_INDEX_NONE, &start, &end);
-	    sprintf(resinfo, "%" TCL_Z_MODIFIER "d %" TCL_Z_MODIFIER "d", start, end-1);
+	    snprintf(resinfo, sizeof(resinfo), "%" TCL_Z_MODIFIER "d %" TCL_Z_MODIFIER "d", start, end-1);
 	    value = Tcl_SetVar2(interp, varName, NULL, resinfo, 0);
 	    if (value == NULL) {
 		Tcl_AppendResult(interp, "couldn't set variable \"",
@@ -4276,7 +4511,7 @@ TestregexpObjCmd(
 
 	    Tcl_RegExpGetInfo(regExpr, &info);
 	    varName = Tcl_GetString(objv[2]);
-	    sprintf(resinfo, "%" TCL_Z_MODIFIER "d", info.extendStart);
+	    snprintf(resinfo, sizeof(resinfo), "%" TCL_Z_MODIFIER "d", info.extendStart);
 	    value = Tcl_SetVar2(interp, varName, NULL, resinfo, 0);
 	    if (value == NULL) {
 		Tcl_AppendResult(interp, "couldn't set variable \"",
@@ -5049,7 +5284,7 @@ TestgetvarfullnameCmd(
  *
  *	This procedure implements the "gettimes" command.  It is used for
  *	computing the time needed for various basic operations such as reading
- *	variables, allocating memory, sprintf, converting variables, etc.
+ *	variables, allocating memory, snprintf, converting variables, etc.
  *
  * Results:
  *	A standard Tcl result.
@@ -5168,15 +5403,15 @@ GetTimesObjCmd(
     fprintf(stderr, "   %.3f usec per Tcl_GetInt of \"12345\"\n",
 	    timePer/100000);
 
-    /* sprintf 100000 times */
-    fprintf(stderr, "sprintf of 12345 100000 times\n");
+    /* snprintf 100000 times */
+    fprintf(stderr, "snprintf of 12345 100000 times\n");
     Tcl_GetTime(&start);
     for (i = 0;  i < 100000;  i++) {
-	sprintf(newString, "%d", 12345);
+	snprintf(newString, sizeof(newString), "%d", 12345);
     }
     Tcl_GetTime(&stop);
     timePer = (stop.sec - start.sec)*1000000 + (stop.usec - start.usec);
-    fprintf(stderr, "   %.3f usec per sprintf of 12345\n",
+    fprintf(stderr, "   %.3f usec per snprintf of 12345\n",
 	    timePer/100000);
 
     /* hashtable lookup 100000 times */
@@ -5683,7 +5918,7 @@ TestChannelCmd(
     Tcl_Channel chan;		/* The opaque type. */
     size_t len;			/* Length of subcommand string. */
     int IOQueued;		/* How much IO is queued inside channel? */
-    char buf[TCL_INTEGER_SPACE];/* For sprintf. */
+    char buf[TCL_INTEGER_SPACE];/* For snprintf. */
     int mode;			/* rw mode of the channel */
 
     if (argc < 2) {
@@ -6597,10 +6832,10 @@ TestGetIndexFromObjStructObjCmd(
 	return TCL_ERROR;
     } else if (idx[1] != target) {
 	char buffer[64];
-	sprintf(buffer, "%d", idx[1]);
+	snprintf(buffer, sizeof(buffer), "%d", idx[1]);
 	Tcl_AppendResult(interp, "index value comparison failed: got ",
 		buffer, NULL);
-	sprintf(buffer, "%d", target);
+	snprintf(buffer, sizeof(buffer), "%d", target);
 	Tcl_AppendResult(interp, " when ", buffer, " expected", NULL);
 	return TCL_ERROR;
     }
@@ -8030,7 +8265,7 @@ InterpCmdResolver(
     Tcl_Interp *interp,
     const char *name,
     TCL_UNUSED(Tcl_Namespace *),
-    TCL_UNUSED(int) /*flags*/,
+    TCL_UNUSED(int) /* flags */,
     Tcl_Command *rPtr)
 {
     Interp *iPtr = (Interp *) interp;
@@ -8215,7 +8450,7 @@ static int
 InterpCompiledVarResolver(
     TCL_UNUSED(Tcl_Interp *),
     const char *name,
-    TCL_UNUSED(Tcl_Size) /*length*/,
+    TCL_UNUSED(Tcl_Size) /* length */,
     TCL_UNUSED(Tcl_Namespace *),
     Tcl_ResolvedVarInfo **rPtr)
 {
diff --git a/generic/tclTestObj.c b/generic/tclTestObj.c
index 3bf6989..52dd53d 100644
--- a/generic/tclTestObj.c
+++ b/generic/tclTestObj.c
@@ -1105,8 +1105,7 @@ TestobjCmd(
 
 	    if (objv[2]->typePtr == NULL) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj("none", TCL_INDEX_NONE));
-	    }
-	    else {
+	    } else {
 		typeName = objv[2]->typePtr->name;
 		if (!strcmp(typeName, "utf32string"))
 		    typeName = "string";
@@ -1261,7 +1260,7 @@ TeststringobjCmd(
     static const char *const options[] = {
 	"append", "appendstrings", "get", "get2", "length", "length2",
 	"set", "set2", "setlength", "maxchars", "range", "appendself",
-	"appendself2", NULL
+	"appendself2", "newunicode", NULL
     };
 
     if (objc < 3) {
@@ -1497,6 +1496,23 @@ TeststringobjCmd(
 	    Tcl_AppendUnicodeToObj(varPtr[varIndex], unicode + length, size - length);
 	    Tcl_SetObjResult(interp, varPtr[varIndex]);
 	    break;
+	case 13: /* newunicode*/
+	    unicode = (Tcl_UniChar *)Tcl_Alloc((objc - 3) * sizeof(Tcl_UniChar));
+	    for (i = 0; i < (objc - 3); ++i) {
+		int val;
+		if (Tcl_GetIntFromObj(interp, objv[i + 3], &val) != TCL_OK) {
+		    break;
+		}
+		unicode[i] = (Tcl_UniChar)val;
+	    }
+	    if (i < (objc-3)) {
+		Tcl_Free(unicode);
+		return TCL_ERROR;
+	    }
+	    SetVarToObj(varPtr, varIndex, Tcl_NewUnicodeObj(unicode, objc - 3));
+	    Tcl_SetObjResult(interp, varPtr[varIndex]);
+	    Tcl_Free(unicode);
+	    break;
     }
 
     return TCL_OK;
@@ -1602,7 +1618,7 @@ CheckIfVarUnset(
     if (varPtr[varIndex] == NULL) {
 	char buf[32 + TCL_INTEGER_SPACE];
 
-	sprintf(buf, "variable %" TCL_Z_MODIFIER "u is unset (NULL)", varIndex);
+	snprintf(buf, sizeof(buf), "variable %" TCL_Z_MODIFIER "u is unset (NULL)", varIndex);
 	Tcl_ResetResult(interp);
 	Tcl_AppendToObj(Tcl_GetObjResult(interp), buf, TCL_INDEX_NONE);
 	return 1;
diff --git a/generic/tclTestProcBodyObj.c b/generic/tclTestProcBodyObj.c
index 8d92c6e..381ff02 100644
--- a/generic/tclTestProcBodyObj.c
+++ b/generic/tclTestProcBodyObj.c
@@ -144,14 +144,14 @@ RegisterCommand(
     char buf[128];
 
     if (cmdTablePtr->exportIt) {
-	sprintf(buf, "namespace eval %s { namespace export %s }",
+	snprintf(buf, sizeof(buf), "namespace eval %s { namespace export %s }",
 		namesp, cmdTablePtr->cmdName);
 	if (Tcl_EvalEx(interp, buf, TCL_INDEX_NONE, 0) != TCL_OK) {
 	    return TCL_ERROR;
 	}
     }
 
-    sprintf(buf, "%s::%s", namesp, cmdTablePtr->cmdName);
+    snprintf(buf, sizeof(buf), "%s::%s", namesp, cmdTablePtr->cmdName);
     Tcl_CreateObjCommand(interp, buf, cmdTablePtr->proc, 0, 0);
     return TCL_OK;
 }
diff --git a/generic/tclThreadAlloc.c b/generic/tclThreadAlloc.c
index 1eb6315..5329991 100644
--- a/generic/tclThreadAlloc.c
+++ b/generic/tclThreadAlloc.c
@@ -640,11 +640,11 @@ Tcl_GetMemoryInfo(
 	if (cachePtr == sharedPtr) {
 	    Tcl_DStringAppendElement(dsPtr, "shared");
 	} else {
-	    sprintf(buf, "thread%p", cachePtr->owner);
+	    snprintf(buf, sizeof(buf), "thread%p", cachePtr->owner);
 	    Tcl_DStringAppendElement(dsPtr, buf);
 	}
 	for (n = 0; n < NBUCKETS; ++n) {
-	    sprintf(buf, "%" TCL_Z_MODIFIER "u %" TCL_Z_MODIFIER "u %" TCL_Z_MODIFIER "u %"
+	    snprintf(buf, sizeof(buf), "%" TCL_Z_MODIFIER "u %" TCL_Z_MODIFIER "u %" TCL_Z_MODIFIER "u %"
 		    TCL_Z_MODIFIER "u %" TCL_Z_MODIFIER "u %" TCL_Z_MODIFIER "u",
 		    bucketInfo[n].blockSize,
 		    cachePtr->buckets[n].numFree,
diff --git a/generic/tclThreadTest.c b/generic/tclThreadTest.c
index 5781329..a5b079a 100644
--- a/generic/tclThreadTest.c
+++ b/generic/tclThreadTest.c
@@ -367,7 +367,7 @@ ThreadObjCmd(
 	} else {
 	    char buf[TCL_INTEGER_SPACE];
 
-	    sprintf(buf, "%" TCL_LL_MODIFIER "d", (long long)id);
+	    snprintf(buf, sizeof(buf), "%" TCL_LL_MODIFIER "d", (long long)id);
 	    Tcl_AppendResult(interp, "cannot join thread ", buf, NULL);
 	}
 	return result;
@@ -649,7 +649,7 @@ ThreadErrorProc(
     char *script;
     char buf[TCL_DOUBLE_SPACE+1];
 
-    sprintf(buf, "%p", Tcl_GetCurrentThread());
+    snprintf(buf, sizeof(buf), "%p", Tcl_GetCurrentThread());
 
     errorInfo = Tcl_GetVar2(interp, "errorInfo", NULL, TCL_GLOBAL_ONLY);
     if (errorProcString == NULL) {
diff --git a/generic/tclUtf.c b/generic/tclUtf.c
index 845690c..1fb8847 100644
--- a/generic/tclUtf.c
+++ b/generic/tclUtf.c
@@ -182,8 +182,8 @@ Invalid(
  *
  * Tcl_UniCharToUtf --
  *
- *	Stores the given Tcl_UniChar as a sequence of UTF-8 bytes in the
- *	provided buffer. Equivalent to Plan 9 runetochar().
+ *	Stores the given Tcl_UniChar as a sequence of UTF-8 bytes in the provided
+ *	buffer. Equivalent to Plan 9 runetochar().
  *
  *	Surrogate pairs are handled as follows: When ch is a high surrogate,
  *	the first byte of the 4-byte UTF-8 sequence is stored in the buffer and
@@ -191,10 +191,9 @@ Invalid(
  *	surrogate and the same buffer, the remaining 3 bytes of the 4-byte
  *	UTF-8 sequence are produced.
  *
- *	If no low surrogate follows the high surrogate (which is actually
- *	illegal), this can be handled reasonably by calling Tcl_UniCharToUtf
- *	again with ch = -1. This produces a 3-byte UTF-8 sequence
- *	representing the high surrogate.
+ *	If no low surrogate follows the high surrogate (which is actually illegal),
+ *	calling Tcl_UniCharToUtf again with ch being -1 produces a 3-byte UTF-8
+ *	sequence representing the high surrogate.
  *
  * Results:
  *	Returns the number of bytes stored into the buffer.
@@ -208,12 +207,13 @@ Invalid(
 #undef Tcl_UniCharToUtf
 size_t
 Tcl_UniCharToUtf(
-    int ch,			/* The Tcl_UniChar to be stored in the
-				 * buffer. Can be or'ed with flag TCL_COMBINE */
-    char *buf)			/* Buffer in which the UTF-8 representation of
-				 * the Tcl_UniChar is stored. Buffer must be
-				 * large enough to hold the UTF-8 character
-				 * (at most 4 bytes). */
+    int ch,	/* The Tcl_UniChar to be stored in the
+		 * buffer. Can be or'ed with flag TCL_COMBINE
+		 */
+    char *buf)	/* Buffer in which the UTF-8 representation of
+		 * ch is stored. Must be large enough to hold the UTF-8
+		 * character (at most 4 bytes).
+		 */
 {
 #if TCL_UTF_MAX > 3
     int flags = ch;
@@ -250,7 +250,12 @@ Tcl_UniCharToUtf(
 		    /* Previous Tcl_UniChar was not a high surrogate, so just output */
 		} else {
 		    /* High surrogate */
+
+		    /* Add 0x10000 to the raw number encoded in the surrogate
+		     * pair in order to get the code point.
+		    */
 		    ch += 0x40;
+
 		    /* Fill buffer with specific 3-byte (invalid) byte combination,
 		       so following low surrogate can recognize it and combine */
 		    buf[2] = (char) ((ch << 4) & 0x30);
@@ -477,7 +482,7 @@ Tcl_UtfToUniChar(
 	}
 	return 1;
     } else if (byte < 0xE0) {
-	if ((src[1] & 0xC0) == 0x80) {
+	if ((byte != 0xC1) && ((src[1] & 0xC0) == 0x80)) {
 	    /*
 	     * Two-byte-character lead-byte followed by a trail-byte.
 	     */
@@ -572,7 +577,7 @@ Tcl_UtfToChar16(
 	}
 	return 1;
     } else if (byte < 0xE0) {
-	if ((src[1] & 0xC0) == 0x80) {
+	if ((byte != 0xC1) && ((src[1] & 0xC0) == 0x80)) {
 	    /*
 	     * Two-byte-character lead-byte followed by a trail-byte.
 	     */
diff --git a/generic/tclUtil.c b/generic/tclUtil.c
index 8f2c16f..c03ead9 100644
--- a/generic/tclUtil.c
+++ b/generic/tclUtil.c
@@ -3115,7 +3115,7 @@ Tcl_PrintDouble(
 	    }
 	}
 
-	sprintf(dst, "e%+d", exponent);
+	snprintf(dst, TCL_DOUBLE_SPACE, "e%+d", exponent);
     } else {
 	/*
 	 * F format for others.
@@ -3778,7 +3778,7 @@ TclIndexEncode(
 	     */
 	    idx = after;
 	} else if (wide <= (irPtr ? INT_MAX : -1)) {
-	    /* These indices always indicate "before the beginning */
+	    /* These indices always indicate "before the beginning" */
 	    idx = before;
 	} else {
 	    /* Encoded end-positive (or end+negative) are offset */
@@ -4026,10 +4026,11 @@ TclGetProcessGlobalValue(
 
 	    Tcl_MutexLock(&pgvPtr->mutex);
 	    epoch = ++pgvPtr->epoch;
-	    Tcl_UtfToExternalDStringEx(pgvPtr->encoding, pgvPtr->value,
-		    pgvPtr->numBytes, TCL_ENCODING_NOCOMPLAIN, &native);
-	    Tcl_ExternalToUtfDStringEx(current, Tcl_DStringValue(&native),
-	    Tcl_DStringLength(&native), TCL_ENCODING_NOCOMPLAIN, &newValue);
+	    Tcl_UtfToExternalDStringEx(NULL, pgvPtr->encoding, pgvPtr->value,
+		pgvPtr->numBytes, TCL_ENCODING_PROFILE_TCL8, &native, NULL);
+	    Tcl_ExternalToUtfDStringEx(NULL, current, Tcl_DStringValue(&native),
+		Tcl_DStringLength(&native), TCL_ENCODING_PROFILE_TCL8,
+		&newValue, NULL);
 	    Tcl_DStringFree(&native);
 	    Tcl_Free(pgvPtr->value);
 	    pgvPtr->value = (char *)Tcl_Alloc(Tcl_DStringLength(&newValue) + 1);
diff --git a/generic/tclZipfs.c b/generic/tclZipfs.c
index 1653dbe..4345d00 100644
--- a/generic/tclZipfs.c
+++ b/generic/tclZipfs.c
@@ -4395,7 +4395,7 @@ ZipChannelOpen(
      * Wrap the ZipChannel into a Tcl_Channel.
      */
 
-    sprintf(cname, "zipfs_%" TCL_Z_MODIFIER "x_%d", z->offset,
+    snprintf(cname, sizeof(cname), "zipfs_%" TCL_Z_MODIFIER "x_%d", z->offset,
 	    ZipFS.idCount++);
     z->zipFilePtr->numOpen++;
     Unlock();
diff --git a/generic/tclZlib.c b/generic/tclZlib.c
index 79aa9cb..2ad93ff 100644
--- a/generic/tclZlib.c
+++ b/generic/tclZlib.c
@@ -289,7 +289,7 @@ ConvertError(
     case Z_NEED_DICT:
 	codeStr = "NEED_DICT";
 	codeStr2 = codeStrBuf;
-	sprintf(codeStrBuf, "%lu", adler);
+	snprintf(codeStrBuf, sizeof(codeStrBuf), "%lu", adler);
 	break;
 
 	/*
@@ -310,7 +310,7 @@ ConvertError(
     default:
 	codeStr = "UNKNOWN";
 	codeStr2 = codeStrBuf;
-	sprintf(codeStrBuf, "%d", code);
+	snprintf(codeStrBuf, sizeof(codeStrBuf), "%d", code);
 	break;
     }
     Tcl_SetObjResult(interp, Tcl_NewStringObj(zError(code), TCL_INDEX_NONE));
@@ -446,7 +446,7 @@ GenerateHeader(
 	Tcl_EncodingState state;
 	valueStr = Tcl_GetStringFromObj(value, &length);
 	result = Tcl_UtfToExternal(NULL, latin1enc, valueStr, length,
-		TCL_ENCODING_START|TCL_ENCODING_END|TCL_ENCODING_STOPONERROR, &state,
+		TCL_ENCODING_START|TCL_ENCODING_END|TCL_ENCODING_PROFILE_STRICT, &state,
 		headerPtr->nativeCommentBuf, MAX_COMMENT_LEN-1, NULL, &len,
 		NULL);
 	if (result != TCL_OK) {
@@ -454,8 +454,7 @@ GenerateHeader(
 		if (result == TCL_CONVERT_UNKNOWN) {
 		    Tcl_AppendResult(
 			interp, "Comment contains characters > 0xFF", NULL);
-		}
-		else {
+		} else {
 		    Tcl_AppendResult(interp, "Comment too large for zip", NULL);
 		}
 	    }
@@ -482,7 +481,7 @@ GenerateHeader(
 	Tcl_EncodingState state;
 	valueStr = Tcl_GetStringFromObj(value, &length);
 	result = Tcl_UtfToExternal(NULL, latin1enc, valueStr, length,
-		TCL_ENCODING_START|TCL_ENCODING_END|TCL_ENCODING_STOPONERROR, &state,
+		TCL_ENCODING_START|TCL_ENCODING_END|TCL_ENCODING_PROFILE_STRICT, &state,
 		headerPtr->nativeFilenameBuf, MAXPATHLEN-1, NULL, &len,
 		NULL);
 	if (result != TCL_OK) {
@@ -490,8 +489,7 @@ GenerateHeader(
 		if (result == TCL_CONVERT_UNKNOWN) {
 		    Tcl_AppendResult(
 			interp, "Filename contains characters > 0xFF", NULL);
-		}
-		else {
+		} else {
 		    Tcl_AppendResult(
 			interp, "Filename too large for zip", NULL);
 		}
@@ -3493,7 +3491,7 @@ ZlibTransformGetOption(
 	    crc = cd->inStream.adler;
 	}
 
-	sprintf(buf, "%lu", crc);
+	snprintf(buf, sizeof(buf), "%lu", crc);
 	if (optionName == NULL) {
 	    Tcl_DStringAppendElement(dsPtr, "-checksum");
 	    Tcl_DStringAppendElement(dsPtr, buf);
diff --git a/library/clock.tcl b/library/clock.tcl
index 136ded2..118d177 100644
--- a/library/clock.tcl
+++ b/library/clock.tcl
@@ -223,7 +223,7 @@ proc ::tcl::clock::Initialize {} {
 
     ::msgcat::mcset ru GREGORIAN_CHANGE_DATE 2421639
 
-    # Romania (Transylvania changed earler - perhaps de_RO should show the
+    # Romania (Transylvania changed earlier - perhaps de_RO should show the
     # earlier date?)
 
     ::msgcat::mcset ro GREGORIAN_CHANGE_DATE 2422063
diff --git a/library/http/http.tcl b/library/http/http.tcl
index 1f476f3..f2ad0a0 100644
--- a/library/http/http.tcl
+++ b/library/http/http.tcl
@@ -1746,6 +1746,9 @@ proc http::OpenSocket {token DoLater} {
 	    }
 	    fconfigure $sock -translation {auto crlf} \
 			     -buffersize $state(-blocksize)
+	    if {[package vsatisfies [package provide Tcl] 9.0-]} {
+		fconfigure $sock -profile tcl8
+	    }
 	    ##Log socket opened, DONE fconfigure - token $token
         }
 
@@ -2164,6 +2167,9 @@ proc http::Connected {token proto phost srvurl} {
     lassign [fconfigure $sock -translation] trRead trWrite
     fconfigure $sock -translation [list $trRead crlf] \
 		     -buffersize $state(-blocksize)
+    if {[package vsatisfies [package provide Tcl] 9.0-]} {
+	fconfigure $sock -profile tcl8
+    }
 
     # The following is disallowed in safe interpreters, but the socket is
     # already in non-blocking mode in that case.
@@ -2554,6 +2560,9 @@ proc http::ReceiveResponse {token} {
     lassign [fconfigure $sock -translation] trRead trWrite
     fconfigure $sock -translation [list auto $trWrite] \
 		     -buffersize $state(-blocksize)
+    if {[package vsatisfies [package provide Tcl] 9.0-]} {
+	fconfigure $sock -profile tcl8
+    }
     Log ^D$tk begin receiving response - token $token
 
     coroutine ${token}--EventCoroutine http::Event $sock $token
@@ -3383,7 +3392,7 @@ proc http::Connect {token proto phost srvurl} {
 	    # If any other requests are in flight or pipelined/queued, they will
 	    # be discarded.
 	}
-	Finish $token "connect failed $err"
+	Finish $token "connect failed: $err"
     return
 }
 
@@ -4545,7 +4554,11 @@ proc http::Eot {token {reason {}}} {
 
 	    set enc [CharsetToEncoding $state(charset)]
 	    if {$enc ne "binary"} {
-		set state(body) [encoding convertfrom $enc $state(body)]
+		if {[package vsatisfies [package provide Tcl] 9.0-]} {
+		    set state(body) [encoding convertfrom -profile tcl8 $enc $state(body)]
+		} else {
+		    set state(body) [encoding convertfrom $enc $state(body)]
+		}
 	    }
 
 	    # Translate text line endings.
@@ -4628,7 +4641,11 @@ proc http::GuessType {token} {
     if {$enc eq "binary"} {
         return 0
     }
-    set state(body) [encoding convertfrom $enc $state(body)]
+    if {[package vsatisfies [package provide Tcl] 9.0-]} {
+	set state(body) [encoding convertfrom -profile tcl8 $enc $state(body)]
+    } else {
+	set state(body) [encoding convertfrom $enc $state(body)]
+    }
     set state(body) [string map {\r\n \n \r \n} $state(body)]
     set state(type) application/xml
     set state(binary) 0
@@ -4709,7 +4726,11 @@ proc http::quoteString {string} {
     # a pre-computed map and [string map] to do the conversion (much faster
     # than [regsub]/[subst]). [Bug 1020491]
 
-    set string [encoding convertto $http(-urlencoding) $string]
+    if {[package vsatisfies [package provide Tcl] 9.0-]} {
+	set string [encoding convertto -profile tcl8 $http(-urlencoding) $string]
+    } else {
+	set string [encoding convertto $http(-urlencoding) $string]
+    }
     return [string map $formMap $string]
 }
 
diff --git a/library/init.tcl b/library/init.tcl
index 424ca3b..70a65b7 100644
--- a/library/init.tcl
+++ b/library/init.tcl
@@ -734,7 +734,7 @@ proc tcl::CopyDirectory {action src dest} {
 	    # the following code is now commented out.
 	    #
 	    # return -code error "error $action \"$src\" to\
-	    # \"$dest\": file already exists"
+	    # \"$dest\": file exists"
 	} else {
 	    # Depending on the platform, and on the current
 	    # working directory, the directories '.', '..'
@@ -746,7 +746,7 @@ proc tcl::CopyDirectory {action src dest} {
 	    foreach s $existing {
 		if {[file tail $s] ni {. ..}} {
 		    return -code error "error $action \"$src\" to\
-		      \"$dest\": file already exists"
+		      \"$dest\": file exists"
 		}
 	    }
 	}
diff --git a/library/manifest.txt b/library/manifest.txt
index cc1e223..5a999f4 100644
--- a/library/manifest.txt
+++ b/library/manifest.txt
@@ -12,7 +12,7 @@ apply {{dir} {
     0 tcl::idna       1.0.1  {cookiejar idna.tcl}
     0 platform        1.0.19 {platform platform.tcl}
     0 platform::shell 1.1.4  {platform shell.tcl}
-    1 tcltest         2.5.5  {tcltest tcltest.tcl}
+    1 tcltest         2.5.6  {tcltest tcltest.tcl}
   } {
     if {$isafe && !$safe} continue
     package ifneeded $package $version  [list source [file join $dir {*}$file]]
diff --git a/library/tcltest/pkgIndex.tcl b/library/tcltest/pkgIndex.tcl
index 18b05e5..9903e32 100644
--- a/library/tcltest/pkgIndex.tcl
+++ b/library/tcltest/pkgIndex.tcl
@@ -9,4 +9,4 @@
 # full path name of this file's directory.
 
 if {![package vsatisfies [package provide Tcl] 8.5-]} {return}
-package ifneeded tcltest 2.5.5 [list source [file join $dir tcltest.tcl]]
+package ifneeded tcltest 2.5.6 [list source [file join $dir tcltest.tcl]]
diff --git a/library/tcltest/tcltest.tcl b/library/tcltest/tcltest.tcl
index 7344f9f..6a161a3 100644
--- a/library/tcltest/tcltest.tcl
+++ b/library/tcltest/tcltest.tcl
@@ -22,7 +22,7 @@ namespace eval tcltest {
     # When the version number changes, be sure to update the pkgIndex.tcl file,
     # and the install directory in the Makefiles.  When the minor version
     # changes (new feature) be sure to update the man page as well.
-    variable Version 2.5.5
+    variable Version 2.5.6
 
     # Compatibility support for dumb variables defined in tcltest 1
     # Do not use these.  Call [package provide Tcl] and [info patchlevel]
@@ -400,7 +400,7 @@ namespace eval tcltest {
 	    default {
 		set outputChannel [open $filename a]
 		if {[package vsatisfies [package provide Tcl] 8.7-]} {
-		    fconfigure $outputChannel -encoding utf-8
+		    fconfigure $outputChannel -profile tcl8 -encoding utf-8
 		}
 		set ChannelsWeOpened($outputChannel) 1
 
@@ -447,7 +447,7 @@ namespace eval tcltest {
 	    default {
 		set errorChannel [open $filename a]
 		if {[package vsatisfies [package provide Tcl] 8.7-]} {
-		    fconfigure $errorChannel -encoding utf-8
+		    fconfigure $errorChannel -profile tcl8 -encoding utf-8
 		}
 		set ChannelsWeOpened($errorChannel) 1
 
@@ -792,7 +792,7 @@ namespace eval tcltest {
 	if {$Option(-loadfile) eq {}} {return}
 	set tmp [open $Option(-loadfile) r]
 	if {[package vsatisfies [package provide Tcl] 8.7-]} {
-	    fconfigure $tmp -encoding utf-8
+	    fconfigure $tmp -profile tcl8 -encoding utf-8
 	}
 	loadScript [read $tmp]
 	close $tmp
@@ -1134,6 +1134,37 @@ proc tcltest::SafeFetch {n1 n2 op} {
     }
 }
 
+# tcltest::Asciify --
+#
+#       Transforms the passed string to contain only printable ascii characters.
+#       Useful for printing to terminals. Non-printables are mapped to
+#       \x, \u or \U sequences.
+#
+# Arguments:
+#       s - string to transform
+#
+# Results:
+#       The transformed strings
+#
+# Side effects:
+#       None.
+
+proc tcltest::Asciify {s} {
+    set print ""
+    foreach c [split $s ""] {
+        if {[string is print $c] && (($c <= "\x7E") || ($c == "\n"))} {
+            append print $c
+        } elseif {$c <= "\xFF"} {
+            append print \\x[format %02X [scan $c %c]]
+        } elseif {$c <= "\xFFFF"} {
+            append print \\u[format %04X [scan $c %c]]
+        } else {
+            append print \\U[format %08X [scan $c %c]]
+        }
+    }
+    return $print
+}
+
 # tcltest::ConstraintInitializer --
 #
 #	Get or set a script that when evaluated in the tcltest namespace
@@ -1340,7 +1371,7 @@ proc tcltest::DefineConstraintInitializers {} {
 	set code 0
 	if {![catch {set f [open "|[list [interpreter]]" w]}]} {
 	    if {[package vsatisfies [package provide Tcl] 8.7-]} {
-		fconfigure $f -encoding utf-8
+		fconfigure $f -profile tcl8 -encoding utf-8
 	    }
 	    if {![catch {puts $f exit}]} {
 		if {![catch {close $f}]} {
@@ -2190,7 +2221,7 @@ proc tcltest::test {name description args} {
 	    if {[file readable $testFile]} {
 		set testFd [open $testFile r]
 		if {[package vsatisfies [package provide Tcl] 8.7-]} {
-		    fconfigure $testFd -encoding utf-8
+		    fconfigure $testFd -profile tcl8 -encoding utf-8
 		}
 		set testLine [expr {[lsearch -regexp \
 			[split [read $testFd] "\n"] \
@@ -2221,9 +2252,13 @@ proc tcltest::test {name description args} {
 	if {$scriptCompare} {
 	    puts [outputChannel] "---- Error testing result: $scriptMatch"
 	} else {
-	    puts [outputChannel] "---- Result was:\n$actualAnswer"
+	    if {[catch {
+		puts [outputChannel] "---- Result was:\n[Asciify $actualAnswer]"
+	    } errMsg]} {
+		puts [outputChannel] "\n---- Result was:\n<error printing result: $errMsg>"
+	    }
 	    puts [outputChannel] "---- Result should have been\
-		    ($match matching):\n$result"
+		    ($match matching):\n[Asciify $result]"
 	}
     }
     if {$errorCodeFailure} {
@@ -2901,7 +2936,7 @@ proc tcltest::runAllTests { {shell ""} } {
 		incr numTestFiles
 		set pipeFd [open $cmd "r"]
 		if {[package vsatisfies [package provide Tcl] 8.7-]} {
-		    fconfigure $pipeFd -encoding utf-8
+		    fconfigure $pipeFd -profile tcl8 -encoding utf-8
 		}
 		while {[gets $pipeFd line] >= 0} {
 		    if {[regexp [join {
@@ -3101,7 +3136,7 @@ proc tcltest::makeFile {contents name {directory ""}} {
     set fd [open $fullName w]
     fconfigure $fd -translation lf
     if {[package vsatisfies [package provide Tcl] 8.7-]} {
-	fconfigure $fd -encoding utf-8
+	fconfigure $fd -profile tcl8 -encoding utf-8
     }
     if {[string index $contents end] eq "\n"} {
 	puts -nonewline $fd $contents
@@ -3252,7 +3287,7 @@ proc tcltest::viewFile {name {directory ""}} {
     set fullName [file join $directory $name]
     set f [open $fullName]
     if {[package vsatisfies [package provide Tcl] 8.7-]} {
-	fconfigure $f -encoding utf-8
+	fconfigure $f -profile tcl8 -encoding utf-8
     }
     set data [read -nonewline $f]
     close $f
diff --git a/library/tzdata/Africa/Cairo b/library/tzdata/Africa/Cairo
index aaeec54..3acbd5e 100644
--- a/library/tzdata/Africa/Cairo
+++ b/library/tzdata/Africa/Cairo
@@ -129,4 +129,158 @@ set TZData(:Africa/Cairo) {
     {1403816400 7200 0 EET}
     {1406844000 10800 1 EEST}
     {1411678800 7200 0 EET}
+    {1682632800 10800 1 EEST}
+    {1698354000 7200 0 EET}
+    {1714082400 10800 1 EEST}
+    {1730408400 7200 0 EET}
+    {1745532000 10800 1 EEST}
+    {1761858000 7200 0 EET}
+    {1776981600 10800 1 EEST}
+    {1793307600 7200 0 EET}
+    {1809036000 10800 1 EEST}
+    {1824757200 7200 0 EET}
+    {1840485600 10800 1 EEST}
+    {1856206800 7200 0 EET}
+    {1871935200 10800 1 EEST}
+    {1887656400 7200 0 EET}
+    {1903384800 10800 1 EEST}
+    {1919710800 7200 0 EET}
+    {1934834400 10800 1 EEST}
+    {1951160400 7200 0 EET}
+    {1966888800 10800 1 EEST}
+    {1982610000 7200 0 EET}
+    {1998338400 10800 1 EEST}
+    {2014059600 7200 0 EET}
+    {2029788000 10800 1 EEST}
+    {2045509200 7200 0 EET}
+    {2061237600 10800 1 EEST}
+    {2076958800 7200 0 EET}
+    {2092687200 10800 1 EEST}
+    {2109013200 7200 0 EET}
+    {2124136800 10800 1 EEST}
+    {2140462800 7200 0 EET}
+    {2156191200 10800 1 EEST}
+    {2171912400 7200 0 EET}
+    {2187640800 10800 1 EEST}
+    {2203362000 7200 0 EET}
+    {2219090400 10800 1 EEST}
+    {2234811600 7200 0 EET}
+    {2250540000 10800 1 EEST}
+    {2266866000 7200 0 EET}
+    {2281989600 10800 1 EEST}
+    {2298315600 7200 0 EET}
+    {2313439200 10800 1 EEST}
+    {2329765200 7200 0 EET}
+    {2345493600 10800 1 EEST}
+    {2361214800 7200 0 EET}
+    {2376943200 10800 1 EEST}
+    {2392664400 7200 0 EET}
+    {2408392800 10800 1 EEST}
+    {2424114000 7200 0 EET}
+    {2439842400 10800 1 EEST}
+    {2456168400 7200 0 EET}
+    {2471292000 10800 1 EEST}
+    {2487618000 7200 0 EET}
+    {2503346400 10800 1 EEST}
+    {2519067600 7200 0 EET}
+    {2534796000 10800 1 EEST}
+    {2550517200 7200 0 EET}
+    {2566245600 10800 1 EEST}
+    {2581966800 7200 0 EET}
+    {2597695200 10800 1 EEST}
+    {2614021200 7200 0 EET}
+    {2629144800 10800 1 EEST}
+    {2645470800 7200 0 EET}
+    {2660594400 10800 1 EEST}
+    {2676920400 7200 0 EET}
+    {2692648800 10800 1 EEST}
+    {2708370000 7200 0 EET}
+    {2724098400 10800 1 EEST}
+    {2739819600 7200 0 EET}
+    {2755548000 10800 1 EEST}
+    {2771269200 7200 0 EET}
+    {2786997600 10800 1 EEST}
+    {2803323600 7200 0 EET}
+    {2818447200 10800 1 EEST}
+    {2834773200 7200 0 EET}
+    {2850501600 10800 1 EEST}
+    {2866222800 7200 0 EET}
+    {2881951200 10800 1 EEST}
+    {2897672400 7200 0 EET}
+    {2913400800 10800 1 EEST}
+    {2929122000 7200 0 EET}
+    {2944850400 10800 1 EEST}
+    {2960571600 7200 0 EET}
+    {2976300000 10800 1 EEST}
+    {2992626000 7200 0 EET}
+    {3007749600 10800 1 EEST}
+    {3024075600 7200 0 EET}
+    {3039804000 10800 1 EEST}
+    {3055525200 7200 0 EET}
+    {3071253600 10800 1 EEST}
+    {3086974800 7200 0 EET}
+    {3102703200 10800 1 EEST}
+    {3118424400 7200 0 EET}
+    {3134152800 10800 1 EEST}
+    {3150478800 7200 0 EET}
+    {3165602400 10800 1 EEST}
+    {3181928400 7200 0 EET}
+    {3197052000 10800 1 EEST}
+    {3213378000 7200 0 EET}
+    {3229106400 10800 1 EEST}
+    {3244827600 7200 0 EET}
+    {3260556000 10800 1 EEST}
+    {3276277200 7200 0 EET}
+    {3292005600 10800 1 EEST}
+    {3307726800 7200 0 EET}
+    {3323455200 10800 1 EEST}
+    {3339781200 7200 0 EET}
+    {3354904800 10800 1 EEST}
+    {3371230800 7200 0 EET}
+    {3386959200 10800 1 EEST}
+    {3402680400 7200 0 EET}
+    {3418408800 10800 1 EEST}
+    {3434130000 7200 0 EET}
+    {3449858400 10800 1 EEST}
+    {3465579600 7200 0 EET}
+    {3481308000 10800 1 EEST}
+    {3497634000 7200 0 EET}
+    {3512757600 10800 1 EEST}
+    {3529083600 7200 0 EET}
+    {3544207200 10800 1 EEST}
+    {3560533200 7200 0 EET}
+    {3576261600 10800 1 EEST}
+    {3591982800 7200 0 EET}
+    {3607711200 10800 1 EEST}
+    {3623432400 7200 0 EET}
+    {3639160800 10800 1 EEST}
+    {3654882000 7200 0 EET}
+    {3670610400 10800 1 EEST}
+    {3686936400 7200 0 EET}
+    {3702060000 10800 1 EEST}
+    {3718386000 7200 0 EET}
+    {3734114400 10800 1 EEST}
+    {3749835600 7200 0 EET}
+    {3765564000 10800 1 EEST}
+    {3781285200 7200 0 EET}
+    {3797013600 10800 1 EEST}
+    {3812734800 7200 0 EET}
+    {3828463200 10800 1 EEST}
+    {3844184400 7200 0 EET}
+    {3859912800 10800 1 EEST}
+    {3876238800 7200 0 EET}
+    {3891362400 10800 1 EEST}
+    {3907688400 7200 0 EET}
+    {3923416800 10800 1 EEST}
+    {3939138000 7200 0 EET}
+    {3954866400 10800 1 EEST}
+    {3970587600 7200 0 EET}
+    {3986316000 10800 1 EEST}
+    {4002037200 7200 0 EET}
+    {4017765600 10800 1 EEST}
+    {4034091600 7200 0 EET}
+    {4049215200 10800 1 EEST}
+    {4065541200 7200 0 EET}
+    {4080664800 10800 1 EEST}
+    {4096990800 7200 0 EET}
 }
diff --git a/library/tzdata/Africa/Casablanca b/library/tzdata/Africa/Casablanca
index cb60740..05ae49f 100644
--- a/library/tzdata/Africa/Casablanca
+++ b/library/tzdata/Africa/Casablanca
@@ -66,7 +66,7 @@ set TZData(:Africa/Casablanca) {
     {1648346400 0 1 +01}
     {1651975200 3600 0 +01}
     {1679191200 0 1 +01}
-    {1682820000 3600 0 +01}
+    {1682215200 3600 0 +01}
     {1710036000 0 1 +01}
     {1713060000 3600 0 +01}
     {1740276000 0 1 +01}
@@ -82,7 +82,7 @@ set TZData(:Africa/Casablanca) {
     {1893290400 0 1 +01}
     {1896919200 3600 0 +01}
     {1924135200 0 1 +01}
-    {1927764000 3600 0 +01}
+    {1927159200 3600 0 +01}
     {1954980000 0 1 +01}
     {1958004000 3600 0 +01}
     {1985220000 0 1 +01}
@@ -98,7 +98,7 @@ set TZData(:Africa/Casablanca) {
     {2138234400 0 1 +01}
     {2141863200 3600 0 +01}
     {2169079200 0 1 +01}
-    {2172708000 3600 0 +01}
+    {2172103200 3600 0 +01}
     {2199924000 0 1 +01}
     {2202948000 3600 0 +01}
     {2230164000 0 1 +01}
@@ -114,7 +114,7 @@ set TZData(:Africa/Casablanca) {
     {2383178400 0 1 +01}
     {2386807200 3600 0 +01}
     {2414023200 0 1 +01}
-    {2417652000 3600 0 +01}
+    {2417047200 3600 0 +01}
     {2444868000 0 1 +01}
     {2447892000 3600 0 +01}
     {2475108000 0 1 +01}
@@ -130,7 +130,7 @@ set TZData(:Africa/Casablanca) {
     {2628122400 0 1 +01}
     {2631751200 3600 0 +01}
     {2658967200 0 1 +01}
-    {2662596000 3600 0 +01}
+    {2661991200 3600 0 +01}
     {2689812000 0 1 +01}
     {2692836000 3600 0 +01}
     {2720052000 0 1 +01}
@@ -146,7 +146,7 @@ set TZData(:Africa/Casablanca) {
     {2873066400 0 1 +01}
     {2876695200 3600 0 +01}
     {2903911200 0 1 +01}
-    {2907540000 3600 0 +01}
+    {2906935200 3600 0 +01}
     {2934756000 0 1 +01}
     {2937780000 3600 0 +01}
     {2964996000 0 1 +01}
@@ -162,7 +162,7 @@ set TZData(:Africa/Casablanca) {
     {3118010400 0 1 +01}
     {3121639200 3600 0 +01}
     {3148855200 0 1 +01}
-    {3152484000 3600 0 +01}
+    {3151879200 3600 0 +01}
     {3179700000 0 1 +01}
     {3182724000 3600 0 +01}
     {3209940000 0 1 +01}
@@ -178,7 +178,7 @@ set TZData(:Africa/Casablanca) {
     {3362954400 0 1 +01}
     {3366583200 3600 0 +01}
     {3393799200 0 1 +01}
-    {3397428000 3600 0 +01}
+    {3396823200 3600 0 +01}
     {3424644000 0 1 +01}
     {3427668000 3600 0 +01}
     {3454884000 0 1 +01}
@@ -188,13 +188,13 @@ set TZData(:Africa/Casablanca) {
     {3515968800 0 1 +01}
     {3519597600 3600 0 +01}
     {3546813600 0 1 +01}
-    {3550442400 3600 0 +01}
+    {3549837600 3600 0 +01}
     {3577658400 0 1 +01}
     {3580682400 3600 0 +01}
     {3607898400 0 1 +01}
     {3611527200 3600 0 +01}
     {3638743200 0 1 +01}
-    {3642372000 3600 0 +01}
+    {3641767200 3600 0 +01}
     {3669588000 0 1 +01}
     {3672612000 3600 0 +01}
     {3699828000 0 1 +01}
diff --git a/library/tzdata/Africa/El_Aaiun b/library/tzdata/Africa/El_Aaiun
index fd3e88f..8dbbdea 100644
--- a/library/tzdata/Africa/El_Aaiun
+++ b/library/tzdata/Africa/El_Aaiun
@@ -55,7 +55,7 @@ set TZData(:Africa/El_Aaiun) {
     {1648346400 0 1 +01}
     {1651975200 3600 0 +01}
     {1679191200 0 1 +01}
-    {1682820000 3600 0 +01}
+    {1682215200 3600 0 +01}
     {1710036000 0 1 +01}
     {1713060000 3600 0 +01}
     {1740276000 0 1 +01}
@@ -71,7 +71,7 @@ set TZData(:Africa/El_Aaiun) {
     {1893290400 0 1 +01}
     {1896919200 3600 0 +01}
     {1924135200 0 1 +01}
-    {1927764000 3600 0 +01}
+    {1927159200 3600 0 +01}
     {1954980000 0 1 +01}
     {1958004000 3600 0 +01}
     {1985220000 0 1 +01}
@@ -87,7 +87,7 @@ set TZData(:Africa/El_Aaiun) {
     {2138234400 0 1 +01}
     {2141863200 3600 0 +01}
     {2169079200 0 1 +01}
-    {2172708000 3600 0 +01}
+    {2172103200 3600 0 +01}
     {2199924000 0 1 +01}
     {2202948000 3600 0 +01}
     {2230164000 0 1 +01}
@@ -103,7 +103,7 @@ set TZData(:Africa/El_Aaiun) {
     {2383178400 0 1 +01}
     {2386807200 3600 0 +01}
     {2414023200 0 1 +01}
-    {2417652000 3600 0 +01}
+    {2417047200 3600 0 +01}
     {2444868000 0 1 +01}
     {2447892000 3600 0 +01}
     {2475108000 0 1 +01}
@@ -119,7 +119,7 @@ set TZData(:Africa/El_Aaiun) {
     {2628122400 0 1 +01}
     {2631751200 3600 0 +01}
     {2658967200 0 1 +01}
-    {2662596000 3600 0 +01}
+    {2661991200 3600 0 +01}
     {2689812000 0 1 +01}
     {2692836000 3600 0 +01}
     {2720052000 0 1 +01}
@@ -135,7 +135,7 @@ set TZData(:Africa/El_Aaiun) {
     {2873066400 0 1 +01}
     {2876695200 3600 0 +01}
     {2903911200 0 1 +01}
-    {2907540000 3600 0 +01}
+    {2906935200 3600 0 +01}
     {2934756000 0 1 +01}
     {2937780000 3600 0 +01}
     {2964996000 0 1 +01}
@@ -151,7 +151,7 @@ set TZData(:Africa/El_Aaiun) {
     {3118010400 0 1 +01}
     {3121639200 3600 0 +01}
     {3148855200 0 1 +01}
-    {3152484000 3600 0 +01}
+    {3151879200 3600 0 +01}
     {3179700000 0 1 +01}
     {3182724000 3600 0 +01}
     {3209940000 0 1 +01}
@@ -167,7 +167,7 @@ set TZData(:Africa/El_Aaiun) {
     {3362954400 0 1 +01}
     {3366583200 3600 0 +01}
     {3393799200 0 1 +01}
-    {3397428000 3600 0 +01}
+    {3396823200 3600 0 +01}
     {3424644000 0 1 +01}
     {3427668000 3600 0 +01}
     {3454884000 0 1 +01}
@@ -177,13 +177,13 @@ set TZData(:Africa/El_Aaiun) {
     {3515968800 0 1 +01}
     {3519597600 3600 0 +01}
     {3546813600 0 1 +01}
-    {3550442400 3600 0 +01}
+    {3549837600 3600 0 +01}
     {3577658400 0 1 +01}
     {3580682400 3600 0 +01}
     {3607898400 0 1 +01}
     {3611527200 3600 0 +01}
     {3638743200 0 1 +01}
-    {3642372000 3600 0 +01}
+    {3641767200 3600 0 +01}
     {3669588000 0 1 +01}
     {3672612000 3600 0 +01}
     {3699828000 0 1 +01}
diff --git a/library/tzdata/America/Ciudad_Juarez b/library/tzdata/America/Ciudad_Juarez
new file mode 100644
index 0000000..5a27e80
--- /dev/null
+++ b/library/tzdata/America/Ciudad_Juarez
@@ -0,0 +1,223 @@
+# created by tools/tclZIC.tcl - do not edit
+
+set TZData(:America/Ciudad_Juarez) {
+    {-9223372036854775808 -25556 0 LMT}
+    {-1514739600 -25200 0 MST}
+    {-1343066400 -21600 0 CST}
+    {-1234807200 -25200 0 MST}
+    {-1220292000 -21600 1 MDT}
+    {-1207159200 -25200 0 MST}
+    {-1191344400 -21600 0 CST}
+    {820476000 -21600 0 CST}
+    {828864000 -18000 1 CDT}
+    {846399600 -21600 0 CST}
+    {860313600 -18000 1 CDT}
+    {877849200 -21600 0 CST}
+    {883634400 -21600 0 CST}
+    {891766800 -21600 0 MDT}
+    {909302400 -25200 0 MST}
+    {923216400 -21600 1 MDT}
+    {941356800 -25200 0 MST}
+    {954666000 -21600 1 MDT}
+    {972806400 -25200 0 MST}
+    {989139600 -21600 1 MDT}
+    {1001836800 -25200 0 MST}
+    {1018170000 -21600 1 MDT}
+    {1035705600 -25200 0 MST}
+    {1049619600 -21600 1 MDT}
+    {1067155200 -25200 0 MST}
+    {1081069200 -21600 1 MDT}
+    {1099209600 -25200 0 MST}
+    {1112518800 -21600 1 MDT}
+    {1130659200 -25200 0 MST}
+    {1143968400 -21600 1 MDT}
+    {1162108800 -25200 0 MST}
+    {1175418000 -21600 1 MDT}
+    {1193558400 -25200 0 MST}
+    {1207472400 -21600 1 MDT}
+    {1225008000 -25200 0 MST}
+    {1238922000 -21600 1 MDT}
+    {1256457600 -25200 0 MST}
+    {1262329200 -25200 0 MST}
+    {1268557200 -21600 1 MDT}
+    {1289116800 -25200 0 MST}
+    {1300006800 -21600 1 MDT}
+    {1320566400 -25200 0 MST}
+    {1331456400 -21600 1 MDT}
+    {1352016000 -25200 0 MST}
+    {1362906000 -21600 1 MDT}
+    {1383465600 -25200 0 MST}
+    {1394355600 -21600 1 MDT}
+    {1414915200 -25200 0 MST}
+    {1425805200 -21600 1 MDT}
+    {1446364800 -25200 0 MST}
+    {1457859600 -21600 1 MDT}
+    {1478419200 -25200 0 MST}
+    {1489309200 -21600 1 MDT}
+    {1509868800 -25200 0 MST}
+    {1520758800 -21600 1 MDT}
+    {1541318400 -25200 0 MST}
+    {1552208400 -21600 1 MDT}
+    {1572768000 -25200 0 MST}
+    {1583658000 -21600 1 MDT}
+    {1604217600 -25200 0 MST}
+    {1615712400 -21600 1 MDT}
+    {1636272000 -25200 0 MST}
+    {1647162000 -21600 1 MDT}
+    {1667120400 -21600 0 CST}
+    {1669788000 -25200 0 MST}
+    {1678611600 -21600 1 MDT}
+    {1699171200 -25200 0 MST}
+    {1710061200 -21600 1 MDT}
+    {1730620800 -25200 0 MST}
+    {1741510800 -21600 1 MDT}
+    {1762070400 -25200 0 MST}
+    {1772960400 -21600 1 MDT}
+    {1793520000 -25200 0 MST}
+    {1805014800 -21600 1 MDT}
+    {1825574400 -25200 0 MST}
+    {1836464400 -21600 1 MDT}
+    {1857024000 -25200 0 MST}
+    {1867914000 -21600 1 MDT}
+    {1888473600 -25200 0 MST}
+    {1899363600 -21600 1 MDT}
+    {1919923200 -25200 0 MST}
+    {1930813200 -21600 1 MDT}
+    {1951372800 -25200 0 MST}
+    {1962867600 -21600 1 MDT}
+    {1983427200 -25200 0 MST}
+    {1994317200 -21600 1 MDT}
+    {2014876800 -25200 0 MST}
+    {2025766800 -21600 1 MDT}
+    {2046326400 -25200 0 MST}
+    {2057216400 -21600 1 MDT}
+    {2077776000 -25200 0 MST}
+    {2088666000 -21600 1 MDT}
+    {2109225600 -25200 0 MST}
+    {2120115600 -21600 1 MDT}
+    {2140675200 -25200 0 MST}
+    {2152170000 -21600 1 MDT}
+    {2172729600 -25200 0 MST}
+    {2183619600 -21600 1 MDT}
+    {2204179200 -25200 0 MST}
+    {2215069200 -21600 1 MDT}
+    {2235628800 -25200 0 MST}
+    {2246518800 -21600 1 MDT}
+    {2267078400 -25200 0 MST}
+    {2277968400 -21600 1 MDT}
+    {2298528000 -25200 0 MST}
+    {2309418000 -21600 1 MDT}
+    {2329977600 -25200 0 MST}
+    {2341472400 -21600 1 MDT}
+    {2362032000 -25200 0 MST}
+    {2372922000 -21600 1 MDT}
+    {2393481600 -25200 0 MST}
+    {2404371600 -21600 1 MDT}
+    {2424931200 -25200 0 MST}
+    {2435821200 -21600 1 MDT}
+    {2456380800 -25200 0 MST}
+    {2467270800 -21600 1 MDT}
+    {2487830400 -25200 0 MST}
+    {2499325200 -21600 1 MDT}
+    {2519884800 -25200 0 MST}
+    {2530774800 -21600 1 MDT}
+    {2551334400 -25200 0 MST}
+    {2562224400 -21600 1 MDT}
+    {2582784000 -25200 0 MST}
+    {2593674000 -21600 1 MDT}
+    {2614233600 -25200 0 MST}
+    {2625123600 -21600 1 MDT}
+    {2645683200 -25200 0 MST}
+    {2656573200 -21600 1 MDT}
+    {2677132800 -25200 0 MST}
+    {2688627600 -21600 1 MDT}
+    {2709187200 -25200 0 MST}
+    {2720077200 -21600 1 MDT}
+    {2740636800 -25200 0 MST}
+    {2751526800 -21600 1 MDT}
+    {2772086400 -25200 0 MST}
+    {2782976400 -21600 1 MDT}
+    {2803536000 -25200 0 MST}
+    {2814426000 -21600 1 MDT}
+    {2834985600 -25200 0 MST}
+    {2846480400 -21600 1 MDT}
+    {2867040000 -25200 0 MST}
+    {2877930000 -21600 1 MDT}
+    {2898489600 -25200 0 MST}
+    {2909379600 -21600 1 MDT}
+    {2929939200 -25200 0 MST}
+    {2940829200 -21600 1 MDT}
+    {2961388800 -25200 0 MST}
+    {2972278800 -21600 1 MDT}
+    {2992838400 -25200 0 MST}
+    {3003728400 -21600 1 MDT}
+    {3024288000 -25200 0 MST}
+    {3035782800 -21600 1 MDT}
+    {3056342400 -25200 0 MST}
+    {3067232400 -21600 1 MDT}
+    {3087792000 -25200 0 MST}
+    {3098682000 -21600 1 MDT}
+    {3119241600 -25200 0 MST}
+    {3130131600 -21600 1 MDT}
+    {3150691200 -25200 0 MST}
+    {3161581200 -21600 1 MDT}
+    {3182140800 -25200 0 MST}
+    {3193030800 -21600 1 MDT}
+    {3213590400 -25200 0 MST}
+    {3225085200 -21600 1 MDT}
+    {3245644800 -25200 0 MST}
+    {3256534800 -21600 1 MDT}
+    {3277094400 -25200 0 MST}
+    {3287984400 -21600 1 MDT}
+    {3308544000 -25200 0 MST}
+    {3319434000 -21600 1 MDT}
+    {3339993600 -25200 0 MST}
+    {3350883600 -21600 1 MDT}
+    {3371443200 -25200 0 MST}
+    {3382938000 -21600 1 MDT}
+    {3403497600 -25200 0 MST}
+    {3414387600 -21600 1 MDT}
+    {3434947200 -25200 0 MST}
+    {3445837200 -21600 1 MDT}
+    {3466396800 -25200 0 MST}
+    {3477286800 -21600 1 MDT}
+    {3497846400 -25200 0 MST}
+    {3508736400 -21600 1 MDT}
+    {3529296000 -25200 0 MST}
+    {3540186000 -21600 1 MDT}
+    {3560745600 -25200 0 MST}
+    {3572240400 -21600 1 MDT}
+    {3592800000 -25200 0 MST}
+    {3603690000 -21600 1 MDT}
+    {3624249600 -25200 0 MST}
+    {3635139600 -21600 1 MDT}
+    {3655699200 -25200 0 MST}
+    {3666589200 -21600 1 MDT}
+    {3687148800 -25200 0 MST}
+    {3698038800 -21600 1 MDT}
+    {3718598400 -25200 0 MST}
+    {3730093200 -21600 1 MDT}
+    {3750652800 -25200 0 MST}
+    {3761542800 -21600 1 MDT}
+    {3782102400 -25200 0 MST}
+    {3792992400 -21600 1 MDT}
+    {3813552000 -25200 0 MST}
+    {3824442000 -21600 1 MDT}
+    {3845001600 -25200 0 MST}
+    {3855891600 -21600 1 MDT}
+    {3876451200 -25200 0 MST}
+    {3887341200 -21600 1 MDT}
+    {3907900800 -25200 0 MST}
+    {3919395600 -21600 1 MDT}
+    {3939955200 -25200 0 MST}
+    {3950845200 -21600 1 MDT}
+    {3971404800 -25200 0 MST}
+    {3982294800 -21600 1 MDT}
+    {4002854400 -25200 0 MST}
+    {4013744400 -21600 1 MDT}
+    {4034304000 -25200 0 MST}
+    {4045194000 -21600 1 MDT}
+    {4065753600 -25200 0 MST}
+    {4076643600 -21600 1 MDT}
+    {4097203200 -25200 0 MST}
+}
diff --git a/library/tzdata/America/Nuuk b/library/tzdata/America/Nuuk
index d010cab..06b472c 100644
--- a/library/tzdata/America/Nuuk
+++ b/library/tzdata/America/Nuuk
@@ -89,5 +89,158 @@ set TZData(:America/Nuuk) {
     {1635642000 -10800 0 -03}
     {1648342800 -7200 1 -02}
     {1667091600 -10800 0 -03}
-    {1679792400 -7200 0 -02}
+    {1679792400 -7200 1 -02}
+    {1698541200 -7200 0 -02}
+    {1711846800 -3600 1 -01}
+    {1729990800 -7200 0 -02}
+    {1743296400 -3600 1 -01}
+    {1761440400 -7200 0 -02}
+    {1774746000 -3600 1 -01}
+    {1792890000 -7200 0 -02}
+    {1806195600 -3600 1 -01}
+    {1824944400 -7200 0 -02}
+    {1837645200 -3600 1 -01}
+    {1856394000 -7200 0 -02}
+    {1869094800 -3600 1 -01}
+    {1887843600 -7200 0 -02}
+    {1901149200 -3600 1 -01}
+    {1919293200 -7200 0 -02}
+    {1932598800 -3600 1 -01}
+    {1950742800 -7200 0 -02}
+    {1964048400 -3600 1 -01}
+    {1982797200 -7200 0 -02}
+    {1995498000 -3600 1 -01}
+    {2014246800 -7200 0 -02}
+    {2026947600 -3600 1 -01}
+    {2045696400 -7200 0 -02}
+    {2058397200 -3600 1 -01}
+    {2077146000 -7200 0 -02}
+    {2090451600 -3600 1 -01}
+    {2108595600 -7200 0 -02}
+    {2121901200 -3600 1 -01}
+    {2140045200 -7200 0 -02}
+    {2153350800 -3600 1 -01}
+    {2172099600 -7200 0 -02}
+    {2184800400 -3600 1 -01}
+    {2203549200 -7200 0 -02}
+    {2216250000 -3600 1 -01}
+    {2234998800 -7200 0 -02}
+    {2248304400 -3600 1 -01}
+    {2266448400 -7200 0 -02}
+    {2279754000 -3600 1 -01}
+    {2297898000 -7200 0 -02}
+    {2311203600 -3600 1 -01}
+    {2329347600 -7200 0 -02}
+    {2342653200 -3600 1 -01}
+    {2361402000 -7200 0 -02}
+    {2374102800 -3600 1 -01}
+    {2392851600 -7200 0 -02}
+    {2405552400 -3600 1 -01}
+    {2424301200 -7200 0 -02}
+    {2437606800 -3600 1 -01}
+    {2455750800 -7200 0 -02}
+    {2469056400 -3600 1 -01}
+    {2487200400 -7200 0 -02}
+    {2500506000 -3600 1 -01}
+    {2519254800 -7200 0 -02}
+    {2531955600 -3600 1 -01}
+    {2550704400 -7200 0 -02}
+    {2563405200 -3600 1 -01}
+    {2582154000 -7200 0 -02}
+    {2595459600 -3600 1 -01}
+    {2613603600 -7200 0 -02}
+    {2626909200 -3600 1 -01}
+    {2645053200 -7200 0 -02}
+    {2658358800 -3600 1 -01}
+    {2676502800 -7200 0 -02}
+    {2689808400 -3600 1 -01}
+    {2708557200 -7200 0 -02}
+    {2721258000 -3600 1 -01}
+    {2740006800 -7200 0 -02}
+    {2752707600 -3600 1 -01}
+    {2771456400 -7200 0 -02}
+    {2784762000 -3600 1 -01}
+    {2802906000 -7200 0 -02}
+    {2816211600 -3600 1 -01}
+    {2834355600 -7200 0 -02}
+    {2847661200 -3600 1 -01}
+    {2866410000 -7200 0 -02}
+    {2879110800 -3600 1 -01}
+    {2897859600 -7200 0 -02}
+    {2910560400 -3600 1 -01}
+    {2929309200 -7200 0 -02}
+    {2942010000 -3600 1 -01}
+    {2960758800 -7200 0 -02}
+    {2974064400 -3600 1 -01}
+    {2992208400 -7200 0 -02}
+    {3005514000 -3600 1 -01}
+    {3023658000 -7200 0 -02}
+    {3036963600 -3600 1 -01}
+    {3055712400 -7200 0 -02}
+    {3068413200 -3600 1 -01}
+    {3087162000 -7200 0 -02}
+    {3099862800 -3600 1 -01}
+    {3118611600 -7200 0 -02}
+    {3131917200 -3600 1 -01}
+    {3150061200 -7200 0 -02}
+    {3163366800 -3600 1 -01}
+    {3181510800 -7200 0 -02}
+    {3194816400 -3600 1 -01}
+    {3212960400 -7200 0 -02}
+    {3226266000 -3600 1 -01}
+    {3245014800 -7200 0 -02}
+    {3257715600 -3600 1 -01}
+    {3276464400 -7200 0 -02}
+    {3289165200 -3600 1 -01}
+    {3307914000 -7200 0 -02}
+    {3321219600 -3600 1 -01}
+    {3339363600 -7200 0 -02}
+    {3352669200 -3600 1 -01}
+    {3370813200 -7200 0 -02}
+    {3384118800 -3600 1 -01}
+    {3402867600 -7200 0 -02}
+    {3415568400 -3600 1 -01}
+    {3434317200 -7200 0 -02}
+    {3447018000 -3600 1 -01}
+    {3465766800 -7200 0 -02}
+    {3479072400 -3600 1 -01}
+    {3497216400 -7200 0 -02}
+    {3510522000 -3600 1 -01}
+    {3528666000 -7200 0 -02}
+    {3541971600 -3600 1 -01}
+    {3560115600 -7200 0 -02}
+    {3573421200 -3600 1 -01}
+    {3592170000 -7200 0 -02}
+    {3604870800 -3600 1 -01}
+    {3623619600 -7200 0 -02}
+    {3636320400 -3600 1 -01}
+    {3655069200 -7200 0 -02}
+    {3668374800 -3600 1 -01}
+    {3686518800 -7200 0 -02}
+    {3699824400 -3600 1 -01}
+    {3717968400 -7200 0 -02}
+    {3731274000 -3600 1 -01}
+    {3750022800 -7200 0 -02}
+    {3762723600 -3600 1 -01}
+    {3781472400 -7200 0 -02}
+    {3794173200 -3600 1 -01}
+    {3812922000 -7200 0 -02}
+    {3825622800 -3600 1 -01}
+    {3844371600 -7200 0 -02}
+    {3857677200 -3600 1 -01}
+    {3875821200 -7200 0 -02}
+    {3889126800 -3600 1 -01}
+    {3907270800 -7200 0 -02}
+    {3920576400 -3600 1 -01}
+    {3939325200 -7200 0 -02}
+    {3952026000 -3600 1 -01}
+    {3970774800 -7200 0 -02}
+    {3983475600 -3600 1 -01}
+    {4002224400 -7200 0 -02}
+    {4015530000 -3600 1 -01}
+    {4033674000 -7200 0 -02}
+    {4046979600 -3600 1 -01}
+    {4065123600 -7200 0 -02}
+    {4078429200 -3600 1 -01}
+    {4096573200 -7200 0 -02}
 }
diff --git a/library/tzdata/America/Yellowknife b/library/tzdata/America/Yellowknife
index 65ddbb6..69e171d 100644
--- a/library/tzdata/America/Yellowknife
+++ b/library/tzdata/America/Yellowknife
@@ -1,266 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:America/Yellowknife) {
-    {-9223372036854775808 0 0 -00}
-    {-1104537600 -25200 0 MST}
-    {-880210800 -21600 1 MWT}
-    {-769395600 -21600 1 MPT}
-    {-765388800 -25200 0 MST}
-    {73472400 -21600 1 MDT}
-    {89193600 -25200 0 MST}
-    {104922000 -21600 1 MDT}
-    {120643200 -25200 0 MST}
-    {136371600 -21600 1 MDT}
-    {152092800 -25200 0 MST}
-    {167821200 -21600 1 MDT}
-    {183542400 -25200 0 MST}
-    {199270800 -21600 1 MDT}
-    {215596800 -25200 0 MST}
-    {230720400 -21600 1 MDT}
-    {247046400 -25200 0 MST}
-    {262774800 -21600 1 MDT}
-    {278496000 -25200 0 MST}
-    {294224400 -21600 1 MDT}
-    {309945600 -25200 0 MST}
-    {315558000 -25200 0 MST}
-    {325674000 -21600 1 MDT}
-    {341395200 -25200 0 MST}
-    {357123600 -21600 1 MDT}
-    {372844800 -25200 0 MST}
-    {388573200 -21600 1 MDT}
-    {404899200 -25200 0 MST}
-    {420022800 -21600 1 MDT}
-    {436348800 -25200 0 MST}
-    {452077200 -21600 1 MDT}
-    {467798400 -25200 0 MST}
-    {483526800 -21600 1 MDT}
-    {499248000 -25200 0 MST}
-    {514976400 -21600 1 MDT}
-    {530697600 -25200 0 MST}
-    {544611600 -21600 1 MDT}
-    {562147200 -25200 0 MST}
-    {576061200 -21600 1 MDT}
-    {594201600 -25200 0 MST}
-    {607510800 -21600 1 MDT}
-    {625651200 -25200 0 MST}
-    {638960400 -21600 1 MDT}
-    {657100800 -25200 0 MST}
-    {671014800 -21600 1 MDT}
-    {688550400 -25200 0 MST}
-    {702464400 -21600 1 MDT}
-    {720000000 -25200 0 MST}
-    {733914000 -21600 1 MDT}
-    {752054400 -25200 0 MST}
-    {765363600 -21600 1 MDT}
-    {783504000 -25200 0 MST}
-    {796813200 -21600 1 MDT}
-    {814953600 -25200 0 MST}
-    {828867600 -21600 1 MDT}
-    {846403200 -25200 0 MST}
-    {860317200 -21600 1 MDT}
-    {877852800 -25200 0 MST}
-    {891766800 -21600 1 MDT}
-    {909302400 -25200 0 MST}
-    {923216400 -21600 1 MDT}
-    {941356800 -25200 0 MST}
-    {954666000 -21600 1 MDT}
-    {972806400 -25200 0 MST}
-    {986115600 -21600 1 MDT}
-    {1004256000 -25200 0 MST}
-    {1018170000 -21600 1 MDT}
-    {1035705600 -25200 0 MST}
-    {1049619600 -21600 1 MDT}
-    {1067155200 -25200 0 MST}
-    {1081069200 -21600 1 MDT}
-    {1099209600 -25200 0 MST}
-    {1112518800 -21600 1 MDT}
-    {1130659200 -25200 0 MST}
-    {1143968400 -21600 1 MDT}
-    {1162108800 -25200 0 MST}
-    {1173603600 -21600 1 MDT}
-    {1194163200 -25200 0 MST}
-    {1205053200 -21600 1 MDT}
-    {1225612800 -25200 0 MST}
-    {1236502800 -21600 1 MDT}
-    {1257062400 -25200 0 MST}
-    {1268557200 -21600 1 MDT}
-    {1289116800 -25200 0 MST}
-    {1300006800 -21600 1 MDT}
-    {1320566400 -25200 0 MST}
-    {1331456400 -21600 1 MDT}
-    {1352016000 -25200 0 MST}
-    {1362906000 -21600 1 MDT}
-    {1383465600 -25200 0 MST}
-    {1394355600 -21600 1 MDT}
-    {1414915200 -25200 0 MST}
-    {1425805200 -21600 1 MDT}
-    {1446364800 -25200 0 MST}
-    {1457859600 -21600 1 MDT}
-    {1478419200 -25200 0 MST}
-    {1489309200 -21600 1 MDT}
-    {1509868800 -25200 0 MST}
-    {1520758800 -21600 1 MDT}
-    {1541318400 -25200 0 MST}
-    {1552208400 -21600 1 MDT}
-    {1572768000 -25200 0 MST}
-    {1583658000 -21600 1 MDT}
-    {1604217600 -25200 0 MST}
-    {1615712400 -21600 1 MDT}
-    {1636272000 -25200 0 MST}
-    {1647162000 -21600 1 MDT}
-    {1667721600 -25200 0 MST}
-    {1678611600 -21600 1 MDT}
-    {1699171200 -25200 0 MST}
-    {1710061200 -21600 1 MDT}
-    {1730620800 -25200 0 MST}
-    {1741510800 -21600 1 MDT}
-    {1762070400 -25200 0 MST}
-    {1772960400 -21600 1 MDT}
-    {1793520000 -25200 0 MST}
-    {1805014800 -21600 1 MDT}
-    {1825574400 -25200 0 MST}
-    {1836464400 -21600 1 MDT}
-    {1857024000 -25200 0 MST}
-    {1867914000 -21600 1 MDT}
-    {1888473600 -25200 0 MST}
-    {1899363600 -21600 1 MDT}
-    {1919923200 -25200 0 MST}
-    {1930813200 -21600 1 MDT}
-    {1951372800 -25200 0 MST}
-    {1962867600 -21600 1 MDT}
-    {1983427200 -25200 0 MST}
-    {1994317200 -21600 1 MDT}
-    {2014876800 -25200 0 MST}
-    {2025766800 -21600 1 MDT}
-    {2046326400 -25200 0 MST}
-    {2057216400 -21600 1 MDT}
-    {2077776000 -25200 0 MST}
-    {2088666000 -21600 1 MDT}
-    {2109225600 -25200 0 MST}
-    {2120115600 -21600 1 MDT}
-    {2140675200 -25200 0 MST}
-    {2152170000 -21600 1 MDT}
-    {2172729600 -25200 0 MST}
-    {2183619600 -21600 1 MDT}
-    {2204179200 -25200 0 MST}
-    {2215069200 -21600 1 MDT}
-    {2235628800 -25200 0 MST}
-    {2246518800 -21600 1 MDT}
-    {2267078400 -25200 0 MST}
-    {2277968400 -21600 1 MDT}
-    {2298528000 -25200 0 MST}
-    {2309418000 -21600 1 MDT}
-    {2329977600 -25200 0 MST}
-    {2341472400 -21600 1 MDT}
-    {2362032000 -25200 0 MST}
-    {2372922000 -21600 1 MDT}
-    {2393481600 -25200 0 MST}
-    {2404371600 -21600 1 MDT}
-    {2424931200 -25200 0 MST}
-    {2435821200 -21600 1 MDT}
-    {2456380800 -25200 0 MST}
-    {2467270800 -21600 1 MDT}
-    {2487830400 -25200 0 MST}
-    {2499325200 -21600 1 MDT}
-    {2519884800 -25200 0 MST}
-    {2530774800 -21600 1 MDT}
-    {2551334400 -25200 0 MST}
-    {2562224400 -21600 1 MDT}
-    {2582784000 -25200 0 MST}
-    {2593674000 -21600 1 MDT}
-    {2614233600 -25200 0 MST}
-    {2625123600 -21600 1 MDT}
-    {2645683200 -25200 0 MST}
-    {2656573200 -21600 1 MDT}
-    {2677132800 -25200 0 MST}
-    {2688627600 -21600 1 MDT}
-    {2709187200 -25200 0 MST}
-    {2720077200 -21600 1 MDT}
-    {2740636800 -25200 0 MST}
-    {2751526800 -21600 1 MDT}
-    {2772086400 -25200 0 MST}
-    {2782976400 -21600 1 MDT}
-    {2803536000 -25200 0 MST}
-    {2814426000 -21600 1 MDT}
-    {2834985600 -25200 0 MST}
-    {2846480400 -21600 1 MDT}
-    {2867040000 -25200 0 MST}
-    {2877930000 -21600 1 MDT}
-    {2898489600 -25200 0 MST}
-    {2909379600 -21600 1 MDT}
-    {2929939200 -25200 0 MST}
-    {2940829200 -21600 1 MDT}
-    {2961388800 -25200 0 MST}
-    {2972278800 -21600 1 MDT}
-    {2992838400 -25200 0 MST}
-    {3003728400 -21600 1 MDT}
-    {3024288000 -25200 0 MST}
-    {3035782800 -21600 1 MDT}
-    {3056342400 -25200 0 MST}
-    {3067232400 -21600 1 MDT}
-    {3087792000 -25200 0 MST}
-    {3098682000 -21600 1 MDT}
-    {3119241600 -25200 0 MST}
-    {3130131600 -21600 1 MDT}
-    {3150691200 -25200 0 MST}
-    {3161581200 -21600 1 MDT}
-    {3182140800 -25200 0 MST}
-    {3193030800 -21600 1 MDT}
-    {3213590400 -25200 0 MST}
-    {3225085200 -21600 1 MDT}
-    {3245644800 -25200 0 MST}
-    {3256534800 -21600 1 MDT}
-    {3277094400 -25200 0 MST}
-    {3287984400 -21600 1 MDT}
-    {3308544000 -25200 0 MST}
-    {3319434000 -21600 1 MDT}
-    {3339993600 -25200 0 MST}
-    {3350883600 -21600 1 MDT}
-    {3371443200 -25200 0 MST}
-    {3382938000 -21600 1 MDT}
-    {3403497600 -25200 0 MST}
-    {3414387600 -21600 1 MDT}
-    {3434947200 -25200 0 MST}
-    {3445837200 -21600 1 MDT}
-    {3466396800 -25200 0 MST}
-    {3477286800 -21600 1 MDT}
-    {3497846400 -25200 0 MST}
-    {3508736400 -21600 1 MDT}
-    {3529296000 -25200 0 MST}
-    {3540186000 -21600 1 MDT}
-    {3560745600 -25200 0 MST}
-    {3572240400 -21600 1 MDT}
-    {3592800000 -25200 0 MST}
-    {3603690000 -21600 1 MDT}
-    {3624249600 -25200 0 MST}
-    {3635139600 -21600 1 MDT}
-    {3655699200 -25200 0 MST}
-    {3666589200 -21600 1 MDT}
-    {3687148800 -25200 0 MST}
-    {3698038800 -21600 1 MDT}
-    {3718598400 -25200 0 MST}
-    {3730093200 -21600 1 MDT}
-    {3750652800 -25200 0 MST}
-    {3761542800 -21600 1 MDT}
-    {3782102400 -25200 0 MST}
-    {3792992400 -21600 1 MDT}
-    {3813552000 -25200 0 MST}
-    {3824442000 -21600 1 MDT}
-    {3845001600 -25200 0 MST}
-    {3855891600 -21600 1 MDT}
-    {3876451200 -25200 0 MST}
-    {3887341200 -21600 1 MDT}
-    {3907900800 -25200 0 MST}
-    {3919395600 -21600 1 MDT}
-    {3939955200 -25200 0 MST}
-    {3950845200 -21600 1 MDT}
-    {3971404800 -25200 0 MST}
-    {3982294800 -21600 1 MDT}
-    {4002854400 -25200 0 MST}
-    {4013744400 -21600 1 MDT}
-    {4034304000 -25200 0 MST}
-    {4045194000 -21600 1 MDT}
-    {4065753600 -25200 0 MST}
-    {4076643600 -21600 1 MDT}
-    {4097203200 -25200 0 MST}
+if {![info exists TZData(America/Edmonton)]} {
+    LoadTimeZoneFile America/Edmonton
 }
+set TZData(:America/Yellowknife) $TZData(:America/Edmonton)
diff --git a/library/tzdata/Asia/Gaza b/library/tzdata/Asia/Gaza
index 1ceb680..d3789d3 100644
--- a/library/tzdata/Asia/Gaza
+++ b/library/tzdata/Asia/Gaza
@@ -127,11 +127,11 @@ set TZData(:Asia/Gaza) {
     {1635458400 7200 0 EET}
     {1648332000 10800 1 EEST}
     {1666998000 7200 0 EET}
-    {1679702400 10800 1 EEST}
+    {1682726400 10800 1 EEST}
     {1698447600 7200 0 EET}
-    {1711756800 10800 1 EEST}
+    {1712966400 10800 1 EEST}
     {1729897200 7200 0 EET}
-    {1743206400 10800 1 EEST}
+    {1743811200 10800 1 EEST}
     {1761346800 7200 0 EET}
     {1774656000 10800 1 EEST}
     {1792796400 7200 0 EET}
@@ -154,48 +154,80 @@ set TZData(:Asia/Gaza) {
     {2058307200 10800 1 EEST}
     {2077052400 7200 0 EET}
     {2090361600 10800 1 EEST}
-    {2108502000 7200 0 EET}
+    {2107897200 7200 0 EET}
     {2121811200 10800 1 EEST}
-    {2139951600 7200 0 EET}
+    {2138742000 7200 0 EET}
     {2153260800 10800 1 EEST}
-    {2172006000 7200 0 EET}
+    {2168982000 7200 0 EET}
     {2184710400 10800 1 EEST}
+    {2199826800 7200 0 EET}
+    {2202854400 10800 1 EEST}
     {2203455600 7200 0 EET}
     {2216160000 10800 1 EEST}
+    {2230066800 7200 0 EET}
+    {2233699200 10800 1 EEST}
     {2234905200 7200 0 EET}
     {2248214400 10800 1 EEST}
+    {2260911600 7200 0 EET}
+    {2263939200 10800 1 EEST}
     {2266354800 7200 0 EET}
     {2279664000 10800 1 EEST}
+    {2291756400 7200 0 EET}
+    {2294784000 10800 1 EEST}
     {2297804400 7200 0 EET}
     {2311113600 10800 1 EEST}
+    {2321996400 7200 0 EET}
+    {2325628800 10800 1 EEST}
     {2329254000 7200 0 EET}
     {2342563200 10800 1 EEST}
+    {2352841200 7200 0 EET}
+    {2355868800 10800 1 EEST}
     {2361308400 7200 0 EET}
     {2374012800 10800 1 EEST}
+    {2383686000 7200 0 EET}
+    {2386713600 10800 1 EEST}
     {2392758000 7200 0 EET}
     {2405462400 10800 1 EEST}
+    {2413926000 7200 0 EET}
+    {2417558400 10800 1 EEST}
     {2424207600 7200 0 EET}
     {2437516800 10800 1 EEST}
+    {2444770800 7200 0 EET}
+    {2447798400 10800 1 EEST}
     {2455657200 7200 0 EET}
     {2468966400 10800 1 EEST}
+    {2475010800 7200 0 EET}
+    {2478643200 10800 1 EEST}
     {2487106800 7200 0 EET}
     {2500416000 10800 1 EEST}
+    {2505855600 7200 0 EET}
+    {2508883200 10800 1 EEST}
     {2519161200 7200 0 EET}
     {2531865600 10800 1 EEST}
+    {2536700400 7200 0 EET}
+    {2539728000 10800 1 EEST}
     {2550610800 7200 0 EET}
     {2563315200 10800 1 EEST}
+    {2566940400 7200 0 EET}
+    {2570572800 10800 1 EEST}
     {2582060400 7200 0 EET}
     {2595369600 10800 1 EEST}
+    {2597785200 7200 0 EET}
+    {2600812800 10800 1 EEST}
     {2613510000 7200 0 EET}
     {2626819200 10800 1 EEST}
+    {2628025200 7200 0 EET}
+    {2631657600 10800 1 EEST}
     {2644959600 7200 0 EET}
     {2658268800 10800 1 EEST}
+    {2658870000 7200 0 EET}
+    {2662502400 10800 1 EEST}
     {2676409200 7200 0 EET}
-    {2689718400 10800 1 EEST}
+    {2692742400 10800 1 EEST}
     {2708463600 7200 0 EET}
-    {2721168000 10800 1 EEST}
+    {2723587200 10800 1 EEST}
     {2739913200 7200 0 EET}
-    {2752617600 10800 1 EEST}
+    {2753827200 10800 1 EEST}
     {2771362800 7200 0 EET}
     {2784672000 10800 1 EEST}
     {2802812400 7200 0 EET}
@@ -218,42 +250,69 @@ set TZData(:Asia/Gaza) {
     {3068323200 10800 1 EEST}
     {3087068400 7200 0 EET}
     {3099772800 10800 1 EEST}
-    {3118518000 7200 0 EET}
+    {3117913200 7200 0 EET}
     {3131827200 10800 1 EEST}
-    {3149967600 7200 0 EET}
+    {3148758000 7200 0 EET}
     {3163276800 10800 1 EEST}
-    {3181417200 7200 0 EET}
+    {3179602800 7200 0 EET}
     {3194726400 10800 1 EEST}
-    {3212866800 7200 0 EET}
+    {3209842800 7200 0 EET}
     {3226176000 10800 1 EEST}
-    {3244921200 7200 0 EET}
-    {3257625600 10800 1 EEST}
-    {3276370800 7200 0 EET}
-    {3289075200 10800 1 EEST}
-    {3307820400 7200 0 EET}
-    {3321129600 10800 1 EEST}
+    {3240687600 7200 0 EET}
+    {3243715200 10800 1 EEST}
+    {3257622000 10800 1 EEST}
+    {3271532400 7200 0 EET}
+    {3274560000 10800 1 EEST}
+    {3289071600 10800 1 EEST}
+    {3301772400 7200 0 EET}
+    {3305404800 10800 1 EEST}
+    {3321126000 10800 1 EEST}
+    {3332617200 7200 0 EET}
+    {3335644800 10800 1 EEST}
     {3339270000 7200 0 EET}
     {3352579200 10800 1 EEST}
+    {3362857200 7200 0 EET}
+    {3366489600 10800 1 EEST}
     {3370719600 7200 0 EET}
     {3384028800 10800 1 EEST}
+    {3393702000 7200 0 EET}
+    {3397334400 10800 1 EEST}
     {3402774000 7200 0 EET}
     {3415478400 10800 1 EEST}
+    {3424546800 7200 0 EET}
+    {3427574400 10800 1 EEST}
     {3434223600 7200 0 EET}
     {3446928000 10800 1 EEST}
+    {3454786800 7200 0 EET}
+    {3458419200 10800 1 EEST}
     {3465673200 7200 0 EET}
     {3478982400 10800 1 EEST}
+    {3485631600 7200 0 EET}
+    {3488659200 10800 1 EEST}
     {3497122800 7200 0 EET}
     {3510432000 10800 1 EEST}
+    {3516476400 7200 0 EET}
+    {3519504000 10800 1 EEST}
     {3528572400 7200 0 EET}
     {3541881600 10800 1 EEST}
+    {3546716400 7200 0 EET}
+    {3550348800 10800 1 EEST}
     {3560022000 7200 0 EET}
     {3573331200 10800 1 EEST}
+    {3577561200 7200 0 EET}
+    {3580588800 10800 1 EEST}
     {3592076400 7200 0 EET}
     {3604780800 10800 1 EEST}
+    {3607801200 7200 0 EET}
+    {3611433600 10800 1 EEST}
     {3623526000 7200 0 EET}
     {3636230400 10800 1 EEST}
+    {3638646000 7200 0 EET}
+    {3642278400 10800 1 EEST}
     {3654975600 7200 0 EET}
     {3668284800 10800 1 EEST}
+    {3669490800 7200 0 EET}
+    {3672518400 10800 1 EEST}
     {3686425200 7200 0 EET}
     {3699734400 10800 1 EEST}
     {3717874800 7200 0 EET}
diff --git a/library/tzdata/Asia/Hebron b/library/tzdata/Asia/Hebron
index b92db8d..140c841 100644
--- a/library/tzdata/Asia/Hebron
+++ b/library/tzdata/Asia/Hebron
@@ -126,11 +126,11 @@ set TZData(:Asia/Hebron) {
     {1635458400 7200 0 EET}
     {1648332000 10800 1 EEST}
     {1666998000 7200 0 EET}
-    {1679702400 10800 1 EEST}
+    {1682726400 10800 1 EEST}
     {1698447600 7200 0 EET}
-    {1711756800 10800 1 EEST}
+    {1712966400 10800 1 EEST}
     {1729897200 7200 0 EET}
-    {1743206400 10800 1 EEST}
+    {1743811200 10800 1 EEST}
     {1761346800 7200 0 EET}
     {1774656000 10800 1 EEST}
     {1792796400 7200 0 EET}
@@ -153,48 +153,80 @@ set TZData(:Asia/Hebron) {
     {2058307200 10800 1 EEST}
     {2077052400 7200 0 EET}
     {2090361600 10800 1 EEST}
-    {2108502000 7200 0 EET}
+    {2107897200 7200 0 EET}
     {2121811200 10800 1 EEST}
-    {2139951600 7200 0 EET}
+    {2138742000 7200 0 EET}
     {2153260800 10800 1 EEST}
-    {2172006000 7200 0 EET}
+    {2168982000 7200 0 EET}
     {2184710400 10800 1 EEST}
+    {2199826800 7200 0 EET}
+    {2202854400 10800 1 EEST}
     {2203455600 7200 0 EET}
     {2216160000 10800 1 EEST}
+    {2230066800 7200 0 EET}
+    {2233699200 10800 1 EEST}
     {2234905200 7200 0 EET}
     {2248214400 10800 1 EEST}
+    {2260911600 7200 0 EET}
+    {2263939200 10800 1 EEST}
     {2266354800 7200 0 EET}
     {2279664000 10800 1 EEST}
+    {2291756400 7200 0 EET}
+    {2294784000 10800 1 EEST}
     {2297804400 7200 0 EET}
     {2311113600 10800 1 EEST}
+    {2321996400 7200 0 EET}
+    {2325628800 10800 1 EEST}
     {2329254000 7200 0 EET}
     {2342563200 10800 1 EEST}
+    {2352841200 7200 0 EET}
+    {2355868800 10800 1 EEST}
     {2361308400 7200 0 EET}
     {2374012800 10800 1 EEST}
+    {2383686000 7200 0 EET}
+    {2386713600 10800 1 EEST}
     {2392758000 7200 0 EET}
     {2405462400 10800 1 EEST}
+    {2413926000 7200 0 EET}
+    {2417558400 10800 1 EEST}
     {2424207600 7200 0 EET}
     {2437516800 10800 1 EEST}
+    {2444770800 7200 0 EET}
+    {2447798400 10800 1 EEST}
     {2455657200 7200 0 EET}
     {2468966400 10800 1 EEST}
+    {2475010800 7200 0 EET}
+    {2478643200 10800 1 EEST}
     {2487106800 7200 0 EET}
     {2500416000 10800 1 EEST}
+    {2505855600 7200 0 EET}
+    {2508883200 10800 1 EEST}
     {2519161200 7200 0 EET}
     {2531865600 10800 1 EEST}
+    {2536700400 7200 0 EET}
+    {2539728000 10800 1 EEST}
     {2550610800 7200 0 EET}
     {2563315200 10800 1 EEST}
+    {2566940400 7200 0 EET}
+    {2570572800 10800 1 EEST}
     {2582060400 7200 0 EET}
     {2595369600 10800 1 EEST}
+    {2597785200 7200 0 EET}
+    {2600812800 10800 1 EEST}
     {2613510000 7200 0 EET}
     {2626819200 10800 1 EEST}
+    {2628025200 7200 0 EET}
+    {2631657600 10800 1 EEST}
     {2644959600 7200 0 EET}
     {2658268800 10800 1 EEST}
+    {2658870000 7200 0 EET}
+    {2662502400 10800 1 EEST}
     {2676409200 7200 0 EET}
-    {2689718400 10800 1 EEST}
+    {2692742400 10800 1 EEST}
     {2708463600 7200 0 EET}
-    {2721168000 10800 1 EEST}
+    {2723587200 10800 1 EEST}
     {2739913200 7200 0 EET}
-    {2752617600 10800 1 EEST}
+    {2753827200 10800 1 EEST}
     {2771362800 7200 0 EET}
     {2784672000 10800 1 EEST}
     {2802812400 7200 0 EET}
@@ -217,42 +249,69 @@ set TZData(:Asia/Hebron) {
     {3068323200 10800 1 EEST}
     {3087068400 7200 0 EET}
     {3099772800 10800 1 EEST}
-    {3118518000 7200 0 EET}
+    {3117913200 7200 0 EET}
     {3131827200 10800 1 EEST}
-    {3149967600 7200 0 EET}
+    {3148758000 7200 0 EET}
     {3163276800 10800 1 EEST}
-    {3181417200 7200 0 EET}
+    {3179602800 7200 0 EET}
     {3194726400 10800 1 EEST}
-    {3212866800 7200 0 EET}
+    {3209842800 7200 0 EET}
     {3226176000 10800 1 EEST}
-    {3244921200 7200 0 EET}
-    {3257625600 10800 1 EEST}
-    {3276370800 7200 0 EET}
-    {3289075200 10800 1 EEST}
-    {3307820400 7200 0 EET}
-    {3321129600 10800 1 EEST}
+    {3240687600 7200 0 EET}
+    {3243715200 10800 1 EEST}
+    {3257622000 10800 1 EEST}
+    {3271532400 7200 0 EET}
+    {3274560000 10800 1 EEST}
+    {3289071600 10800 1 EEST}
+    {3301772400 7200 0 EET}
+    {3305404800 10800 1 EEST}
+    {3321126000 10800 1 EEST}
+    {3332617200 7200 0 EET}
+    {3335644800 10800 1 EEST}
     {3339270000 7200 0 EET}
     {3352579200 10800 1 EEST}
+    {3362857200 7200 0 EET}
+    {3366489600 10800 1 EEST}
     {3370719600 7200 0 EET}
     {3384028800 10800 1 EEST}
+    {3393702000 7200 0 EET}
+    {3397334400 10800 1 EEST}
     {3402774000 7200 0 EET}
     {3415478400 10800 1 EEST}
+    {3424546800 7200 0 EET}
+    {3427574400 10800 1 EEST}
     {3434223600 7200 0 EET}
     {3446928000 10800 1 EEST}
+    {3454786800 7200 0 EET}
+    {3458419200 10800 1 EEST}
     {3465673200 7200 0 EET}
     {3478982400 10800 1 EEST}
+    {3485631600 7200 0 EET}
+    {3488659200 10800 1 EEST}
     {3497122800 7200 0 EET}
     {3510432000 10800 1 EEST}
+    {3516476400 7200 0 EET}
+    {3519504000 10800 1 EEST}
     {3528572400 7200 0 EET}
     {3541881600 10800 1 EEST}
+    {3546716400 7200 0 EET}
+    {3550348800 10800 1 EEST}
     {3560022000 7200 0 EET}
     {3573331200 10800 1 EEST}
+    {3577561200 7200 0 EET}
+    {3580588800 10800 1 EEST}
     {3592076400 7200 0 EET}
     {3604780800 10800 1 EEST}
+    {3607801200 7200 0 EET}
+    {3611433600 10800 1 EEST}
     {3623526000 7200 0 EET}
     {3636230400 10800 1 EEST}
+    {3638646000 7200 0 EET}
+    {3642278400 10800 1 EEST}
     {3654975600 7200 0 EET}
     {3668284800 10800 1 EEST}
+    {3669490800 7200 0 EET}
+    {3672518400 10800 1 EEST}
     {3686425200 7200 0 EET}
     {3699734400 10800 1 EEST}
     {3717874800 7200 0 EET}
diff --git a/library/tzdata/Europe/Kirov b/library/tzdata/Europe/Kirov
index 8762d22..9d2afa5 100644
--- a/library/tzdata/Europe/Kirov
+++ b/library/tzdata/Europe/Kirov
@@ -20,51 +20,51 @@ set TZData(:Europe/Kirov) {
     {559692000 14400 0 +04}
     {575416800 18000 1 +05}
     {591141600 14400 0 +04}
-    {606866400 10800 0 +04}
-    {606870000 14400 1 +04}
-    {622594800 10800 0 +03}
-    {638319600 14400 1 +04}
-    {654649200 10800 0 +03}
+    {606866400 10800 0 MSD}
+    {606870000 14400 1 MSD}
+    {622594800 10800 0 MSK}
+    {638319600 14400 1 MSD}
+    {654649200 10800 0 MSK}
     {670374000 14400 0 +04}
-    {701820000 10800 0 +04}
-    {701823600 14400 1 +04}
-    {717548400 10800 0 +03}
-    {733273200 14400 1 +04}
-    {748998000 10800 0 +03}
-    {764722800 14400 1 +04}
-    {780447600 10800 0 +03}
-    {796172400 14400 1 +04}
-    {811897200 10800 0 +03}
-    {828226800 14400 1 +04}
-    {846370800 10800 0 +03}
-    {859676400 14400 1 +04}
-    {877820400 10800 0 +03}
-    {891126000 14400 1 +04}
-    {909270000 10800 0 +03}
-    {922575600 14400 1 +04}
-    {941324400 10800 0 +03}
-    {954025200 14400 1 +04}
-    {972774000 10800 0 +03}
-    {985474800 14400 1 +04}
-    {1004223600 10800 0 +03}
-    {1017529200 14400 1 +04}
-    {1035673200 10800 0 +03}
-    {1048978800 14400 1 +04}
-    {1067122800 10800 0 +03}
-    {1080428400 14400 1 +04}
-    {1099177200 10800 0 +03}
-    {1111878000 14400 1 +04}
-    {1130626800 10800 0 +03}
-    {1143327600 14400 1 +04}
-    {1162076400 10800 0 +03}
-    {1174777200 14400 1 +04}
-    {1193526000 10800 0 +03}
-    {1206831600 14400 1 +04}
-    {1224975600 10800 0 +03}
-    {1238281200 14400 1 +04}
-    {1256425200 10800 0 +03}
-    {1269730800 14400 1 +04}
-    {1288479600 10800 0 +03}
-    {1301180400 14400 0 +04}
-    {1414274400 10800 0 +03}
+    {701820000 10800 0 MSD}
+    {701823600 14400 1 MSD}
+    {717548400 10800 0 MSK}
+    {733273200 14400 1 MSD}
+    {748998000 10800 0 MSK}
+    {764722800 14400 1 MSD}
+    {780447600 10800 0 MSK}
+    {796172400 14400 1 MSD}
+    {811897200 10800 0 MSK}
+    {828226800 14400 1 MSD}
+    {846370800 10800 0 MSK}
+    {859676400 14400 1 MSD}
+    {877820400 10800 0 MSK}
+    {891126000 14400 1 MSD}
+    {909270000 10800 0 MSK}
+    {922575600 14400 1 MSD}
+    {941324400 10800 0 MSK}
+    {954025200 14400 1 MSD}
+    {972774000 10800 0 MSK}
+    {985474800 14400 1 MSD}
+    {1004223600 10800 0 MSK}
+    {1017529200 14400 1 MSD}
+    {1035673200 10800 0 MSK}
+    {1048978800 14400 1 MSD}
+    {1067122800 10800 0 MSK}
+    {1080428400 14400 1 MSD}
+    {1099177200 10800 0 MSK}
+    {1111878000 14400 1 MSD}
+    {1130626800 10800 0 MSK}
+    {1143327600 14400 1 MSD}
+    {1162076400 10800 0 MSK}
+    {1174777200 14400 1 MSD}
+    {1193526000 10800 0 MSK}
+    {1206831600 14400 1 MSD}
+    {1224975600 10800 0 MSK}
+    {1238281200 14400 1 MSD}
+    {1256425200 10800 0 MSK}
+    {1269730800 14400 1 MSD}
+    {1288479600 10800 0 MSK}
+    {1301180400 14400 0 MSK}
+    {1414274400 10800 0 MSK}
 }
diff --git a/library/tzdata/Europe/Volgograd b/library/tzdata/Europe/Volgograd
index 2ce2dfe..00c3cb3 100644
--- a/library/tzdata/Europe/Volgograd
+++ b/library/tzdata/Europe/Volgograd
@@ -19,55 +19,55 @@ set TZData(:Europe/Volgograd) {
     {528242400 14400 0 +04}
     {543967200 18000 1 +05}
     {559692000 14400 0 +04}
-    {575416800 10800 0 +04}
-    {575420400 14400 1 +04}
-    {591145200 10800 0 +03}
-    {606870000 14400 1 +04}
-    {622594800 10800 0 +03}
-    {638319600 14400 1 +04}
-    {654649200 10800 0 +03}
+    {575416800 10800 0 MSD}
+    {575420400 14400 1 MSD}
+    {591145200 10800 0 MSK}
+    {606870000 14400 1 MSD}
+    {622594800 10800 0 MSK}
+    {638319600 14400 1 MSD}
+    {654649200 10800 0 MSK}
     {670374000 14400 0 +04}
-    {701820000 10800 0 +04}
-    {701823600 14400 1 +04}
-    {717548400 10800 0 +03}
-    {733273200 14400 1 +04}
-    {748998000 10800 0 +03}
-    {764722800 14400 1 +04}
-    {780447600 10800 0 +03}
-    {796172400 14400 1 +04}
-    {811897200 10800 0 +03}
-    {828226800 14400 1 +04}
-    {846370800 10800 0 +03}
-    {859676400 14400 1 +04}
-    {877820400 10800 0 +03}
-    {891126000 14400 1 +04}
-    {909270000 10800 0 +03}
-    {922575600 14400 1 +04}
-    {941324400 10800 0 +03}
-    {954025200 14400 1 +04}
-    {972774000 10800 0 +03}
-    {985474800 14400 1 +04}
-    {1004223600 10800 0 +03}
-    {1017529200 14400 1 +04}
-    {1035673200 10800 0 +03}
-    {1048978800 14400 1 +04}
-    {1067122800 10800 0 +03}
-    {1080428400 14400 1 +04}
-    {1099177200 10800 0 +03}
-    {1111878000 14400 1 +04}
-    {1130626800 10800 0 +03}
-    {1143327600 14400 1 +04}
-    {1162076400 10800 0 +03}
-    {1174777200 14400 1 +04}
-    {1193526000 10800 0 +03}
-    {1206831600 14400 1 +04}
-    {1224975600 10800 0 +03}
-    {1238281200 14400 1 +04}
-    {1256425200 10800 0 +03}
-    {1269730800 14400 1 +04}
-    {1288479600 10800 0 +03}
-    {1301180400 14400 0 +04}
-    {1414274400 10800 0 +03}
+    {701820000 10800 0 MSD}
+    {701823600 14400 1 MSD}
+    {717548400 10800 0 MSK}
+    {733273200 14400 1 MSD}
+    {748998000 10800 0 MSK}
+    {764722800 14400 1 MSD}
+    {780447600 10800 0 MSK}
+    {796172400 14400 1 MSD}
+    {811897200 10800 0 MSK}
+    {828226800 14400 1 MSD}
+    {846370800 10800 0 MSK}
+    {859676400 14400 1 MSD}
+    {877820400 10800 0 MSK}
+    {891126000 14400 1 MSD}
+    {909270000 10800 0 MSK}
+    {922575600 14400 1 MSD}
+    {941324400 10800 0 MSK}
+    {954025200 14400 1 MSD}
+    {972774000 10800 0 MSK}
+    {985474800 14400 1 MSD}
+    {1004223600 10800 0 MSK}
+    {1017529200 14400 1 MSD}
+    {1035673200 10800 0 MSK}
+    {1048978800 14400 1 MSD}
+    {1067122800 10800 0 MSK}
+    {1080428400 14400 1 MSD}
+    {1099177200 10800 0 MSK}
+    {1111878000 14400 1 MSD}
+    {1130626800 10800 0 MSK}
+    {1143327600 14400 1 MSD}
+    {1162076400 10800 0 MSK}
+    {1174777200 14400 1 MSD}
+    {1193526000 10800 0 MSK}
+    {1206831600 14400 1 MSD}
+    {1224975600 10800 0 MSK}
+    {1238281200 14400 1 MSD}
+    {1256425200 10800 0 MSK}
+    {1269730800 14400 1 MSD}
+    {1288479600 10800 0 MSK}
+    {1301180400 14400 0 MSK}
+    {1414274400 10800 0 MSK}
     {1540681200 14400 0 +04}
-    {1609020000 10800 0 +03}
+    {1609020000 10800 0 MSK}
 }
diff --git a/macosx/README b/macosx/README
index c1f9e87..ee1b7ea 100644
--- a/macosx/README
+++ b/macosx/README
@@ -113,7 +113,7 @@ your ${USER}.pbxuser file (located inside the Tcl.xcodeproj bundle directory)
 with a text editor.
 
 - To build universal binaries outside of the Xcode IDE, set CFLAGS as follows:
-	export CFLAGS="-arch x86_64 -arch arm64e"
+	export CFLAGS="-arch x86_64 -arch arm64"
 This requires Mac OS X 10.6 and Xcode 10.2 and will work on any architecture.
 Note that configure requires CFLAGS to contain a least one architecture that can
 be run on the build machine (i.e. x86_64 on Core2/Xeon).
@@ -133,7 +133,7 @@ If you are building from CVS, omit this step (CVS source tree names usually do
 not contain a version number).
 
 - Setup environment variables as desired, e.g. for a universal build on 10.5:
-	CFLAGS="-arch x86_64 -arch arm64e -mmacosx-version-min=10.5"
+	CFLAGS="-arch x86_64 -arch arm64 -mmacosx-version-min=10.5"
 	export CFLAGS
 
 - Change to the directory containing the Tcl source tree and build:
diff --git a/macosx/Tcl.xcodeproj/project.pbxproj b/macosx/Tcl.xcodeproj/project.pbxproj
index 872a8cd..fc00f74 100644
--- a/macosx/Tcl.xcodeproj/project.pbxproj
+++ b/macosx/Tcl.xcodeproj/project.pbxproj
@@ -2122,7 +2122,7 @@
 			baseConfigurationReference = F97AE82B0B65C69B00310EA2 /* Tcl-Release.xcconfig */;
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
-				CFLAGS = "-arch x86_64 -arch arm64e $(CFLAGS)";
+				CFLAGS = "-arch x86_64 -arch arm64 $(CFLAGS)";
 				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				PREBINDING = NO;
 			};
@@ -2507,7 +2507,7 @@
 			baseConfigurationReference = F97AE82B0B65C69B00310EA2 /* Tcl-Release.xcconfig */;
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
-				CFLAGS = "-arch x86_64 -arch arm64e $(CFLAGS)";
+				CFLAGS = "-arch x86_64 -arch arm64 $(CFLAGS)";
 				GCC_VERSION = 4.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				PREBINDING = NO;
@@ -2545,7 +2545,7 @@
 			baseConfigurationReference = F97AE82B0B65C69B00310EA2 /* Tcl-Release.xcconfig */;
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
-				CFLAGS = "-arch x86_64 -arch arm64e $(CFLAGS)";
+				CFLAGS = "-arch x86_64 -arch arm64 $(CFLAGS)";
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				GCC = "llvm-gcc";
 				GCC_OPTIMIZATION_LEVEL = 4;
@@ -2685,7 +2685,7 @@
 				ARCHS = (
 					"$(NATIVE_ARCH_64_BIT)",
 				);
-				CFLAGS = "-arch x86_64 -arch arm64e $(CFLAGS)";
+				CFLAGS = "-arch x86_64 -arch arm64 $(CFLAGS)";
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				GCC = clang;
 				GCC_OPTIMIZATION_LEVEL = 4;
@@ -2752,7 +2752,7 @@
 			baseConfigurationReference = F97AE82B0B65C69B00310EA2 /* Tcl-Release.xcconfig */;
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
-				CFLAGS = "-arch x86_64 -arch arm64e $(CFLAGS)";
+				CFLAGS = "-arch x86_64 -arch arm64 $(CFLAGS)";
 				CPPFLAGS = "-isysroot $(SDKROOT) $(CPPFLAGS)";
 				MACOSX_DEPLOYMENT_TARGET = 10.5;
 				PREBINDING = NO;
diff --git a/macosx/tclMacOSXFCmd.c b/macosx/tclMacOSXFCmd.c
index 7fc085c..78fa45c 100644
--- a/macosx/tclMacOSXFCmd.c
+++ b/macosx/tclMacOSXFCmd.c
@@ -643,7 +643,7 @@ SetOSTypeFromAny(
     size_t length;
 
     string = Tcl_GetStringFromObj(objPtr, &length);
-    Tcl_UtfToExternalDStringEx(encoding, string, length, TCL_ENCODING_NOCOMPLAIN, &ds);
+    Tcl_UtfToExternalDStringEx(NULL, encoding, string, length, TCL_ENCODING_PROFILE_TCL8, &ds, NULL);
 
     if (Tcl_DStringLength(&ds) > 4) {
 	if (interp) {
diff --git a/tests/chanio.test b/tests/chanio.test
index 9a25f8b..09e71ca 100644
--- a/tests/chanio.test
+++ b/tests/chanio.test
@@ -121,7 +121,7 @@ test chan-io-1.6 {Tcl_WriteChars: WriteBytes} {
     chan puts -nonewline $f "a\x4D\x00"
     chan close $f
     contents $path(test1)
-} "aM\x00"
+} aM\x00
 test chan-io-1.7 {Tcl_WriteChars: WriteChars} {
     set f [open $path(test1) w]
     chan configure $f -encoding shiftjis
@@ -254,7 +254,7 @@ test chan-io-3.3 {WriteChars: compatibility with WriteBytes: flush on line} -bod
 test chan-io-3.4 {WriteChars: loop over stage buffer} -body {
     # stage buffer maps to more than can be queued at once.
     set f [open $path(test1) w]
-    chan configure $f -encoding jis0208 -buffersize 16 -nocomplainencoding 1
+    chan configure $f -encoding jis0208 -buffersize 16 -profile tcl8
     chan puts -nonewline $f "\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
     set x [list [contents $path(test1)]]
     chan close $f
@@ -267,7 +267,7 @@ test chan-io-3.5 {WriteChars: saved != 0} -body {
     # be moved to beginning of next channel buffer to preserve requested
     # buffersize.
     set f [open $path(test1) w]
-    chan configure $f -encoding jis0208 -buffersize 17 -nocomplainencoding 1
+    chan configure $f -encoding jis0208 -buffersize 17 -profile tcl8
     chan puts -nonewline $f "\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
     set x [list [contents $path(test1)]]
     chan close $f
@@ -286,7 +286,7 @@ test chan-io-3.6 {WriteChars: (stageRead + dstWrote == 0)} -body {
     # last byte of Ａ plus the all of Ｂ) appended.
     set f [open $path(test1) w]
     chan configure $f -encoding shiftjis -buffersize 16
-    chan puts -nonewline $f "12345678901234ＡＢ"
+    chan puts -nonewline $f 12345678901234ＡＢ
     set x [list [contents $path(test1)]]
     chan close $f
     lappend x [contents $path(test1)]
@@ -300,7 +300,7 @@ test chan-io-3.7 {WriteChars: (bufPtr->nextAdded > bufPtr->length)} -body {
     # on flush. The truncated bytes are moved to the beginning of the next
     # channel buffer.
     set f [open $path(test1) w]
-    chan configure $f -encoding jis0208 -buffersize 17 -nocomplainencoding 1
+    chan configure $f -encoding jis0208 -buffersize 17 -profile tcl8
     chan puts -nonewline $f "\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
     set x [list [contents $path(test1)]]
     chan close $f
@@ -1218,7 +1218,7 @@ test chan-io-8.7 {PeekAhead: cleanup} -setup {
     chan puts -nonewline $f "abcdefghijklmno\r"
     # here
     lappend x [chan gets $f line] $line [testchannel queuedcr $f]
-    chan puts -nonewline $f "\x1A"
+    chan puts -nonewline $f \x1A
     lappend x [chan gets $f line] $line
 } -cleanup {
     chan close $f
@@ -1374,22 +1374,22 @@ test chan-io-12.4 {ReadChars: split-up char} -setup {
     chan configure $f -encoding shiftjis
     vwait [namespace which -variable x]
     chan configure $f -encoding binary -blocking 1
-    chan puts -nonewline $f "\x7B"
+    chan puts -nonewline $f \x7B
     after 500			;# Give the cat process time to catch up
     chan configure $f -encoding shiftjis -blocking 0
     vwait [namespace which -variable x]
     return $x
 } -cleanup {
     chan close $f
-} -result [list "123456789012345" 1 "本" 0]
+} -result [list "123456789012345" 1 本 0]
 test chan-io-12.5 {ReadChars: chan events on partial characters} -setup {
     variable x {}
 } -constraints {stdio fileevent} -body {
     set path(test1) [makeFile {
 	chan configure stdout -encoding binary -buffering none
-	chan gets stdin; chan puts -nonewline "\xE7"
-	chan gets stdin; chan puts -nonewline "\x89"
-	chan gets stdin; chan puts -nonewline "\xA6"
+	chan gets stdin; chan puts -nonewline \xE7
+	chan gets stdin; chan puts -nonewline \x89
+	chan gets stdin; chan puts -nonewline \xA6
     } test1]
     set f [openpipe r+ $path(test1)]
     chan event $f readable [namespace code {
@@ -4982,7 +4982,7 @@ test chan-io-38.2 {Tcl_SetChannelBufferSize, Tcl_GetChannelBufferSize} -setup {
 test chan-io-38.3 {Tcl_SetChannelBufferSize, changing buffersize between reads} {
     # This test crashes the interp if Bug #427196 is not fixed
     set chan [open [info script] r]
-    chan configure $chan -buffersize 10
+    chan configure $chan -buffersize 10 -encoding utf-8
     set var [chan read $chan 2]
     chan configure $chan -buffersize 32
     append var [chan read $chan]
@@ -5213,7 +5213,7 @@ test chan-io-39.17 {Tcl_SetChannelOption: -encoding, clearing CHANNEL_NEED_MORE_
 } -constraints {stdio fileevent} -body {
     set f [openpipe r+ $path(cat)]
     chan configure $f -encoding binary
-    chan puts -nonewline $f "\xE7"
+    chan puts -nonewline $f \xE7
     chan flush $f
     chan configure $f -encoding utf-8 -blocking 0
     chan event $f readable [namespace code { lappend x [chan read $f] }]
@@ -6845,7 +6845,7 @@ set path(utf8-rp.txt)    [makeFile {} utf8-rp.txt]
 # Create kyrillic file, use lf translation to avoid os eol issues
 set out [open $path(kyrillic.txt) w]
 chan configure $out -encoding koi8-r -translation lf
-chan puts       $out "АА"
+chan puts       $out АА
 chan close      $out
 test chan-io-52.9 {TclCopyChannel & encodings} {fcopy} {
     # Copy kyrillic to UTF-8, using chan copy.
@@ -6883,7 +6883,7 @@ test chan-io-52.10 {TclCopyChannel & encodings} {fcopy} {
 test chan-io-52.11 {TclCopyChannel & encodings} -setup {
     set f [open $path(utf8-fcopy.txt) w]
     fconfigure $f -encoding utf-8 -translation lf
-    puts $f "АА"
+    puts $f АА
     close $f
 } -constraints {fcopy} -body {
     # binary to encoding => the input has to be in utf-8 to make sense to the
@@ -7580,7 +7580,7 @@ test chan-io-60.1 {writing illegal utf sequences} {fileevent testbytestring} {
     # cut of the remainder of the error stack, especially the filename
     set result [lreplace $result 3 3 [lindex [split [lindex $result 3] \n] 0]]
     list $x $result
-} {1 {gets {} catch {error writing "stdout": illegal byte sequence}}}
+} {1 {gets {} catch {error writing "stdout": invalid or incomplete multibyte or wide character}}}
 
 test chan-io-61.1 {Reset eof state after changing the eof char} -setup {
     set datafile [makeFile {} eofchar]
diff --git a/tests/cmdAH.test b/tests/cmdAH.test
index 44d5441..c9606bf 100644
--- a/tests/cmdAH.test
+++ b/tests/cmdAH.test
@@ -180,238 +180,513 @@ test cmdAH-3.2 {Tcl_ContinueObjCmd, success} {
     list [catch {continue} msg] $msg
 } {4 {}}
 
-test cmdAH-4.1 {Tcl_EncodingObjCmd} -returnCodes error -body {
+###
+# encoding command
+
+set "numargErrors(encoding system)" {^wrong # args: should be "(encoding |::tcl::encoding::)system \?encoding\?"$}
+set "numargErrors(encoding convertfrom)" {wrong # args: should be "(encoding |::tcl::encoding::)convertfrom \?-profile profile\? \?-failindex var\? encoding data" or "(encoding |::tcl::encoding::)convertfrom data"}
+set "numargErrors(encoding convertto)" {wrong # args: should be "(encoding |::tcl::encoding::)convertto \?-profile profile\? \?-failindex var\? encoding data" or "(encoding |::tcl::encoding::)convertto data"}
+set "numargErrors(encoding names)" {wrong # args: should be "encoding names"}
+set "numargErrors(encoding profiles)" {wrong # args: should be "encoding profiles"}
+
+source [file join [file dirname [info script]] encodingVectors.tcl]
+
+
+# Maps utf-{16,32}{le,be} to utf-16, utf-32 and
+# others to "". Used to test utf-16, utf-32 based
+# on system endianness
+proc endianUtf {enc} {
+    if {$::tcl_platform(byteOrder) eq "littleEndian"} {
+        set endian le
+    } else {
+        set endian be
+    }
+    if {$enc eq "utf-16$endian" || $enc eq "utf-32$endian"} {
+        return [string range $enc 0 5]
+    }
+    return ""
+}
+
+# Map arbitrary strings to printable form in ASCII.
+proc printable {s} {
+    set print ""
+    foreach c [split $s ""] {
+        set i [scan $c %c]
+        if {[string is print $c] && ($i <= 127)} {
+            append print $c
+        } elseif {$i <= 0xff} {
+            append print \\x[format %02X $i]
+        } elseif {$i <= 0xffff} {
+            append print \\u[format %04X $i]
+        } else {
+            append print \\U[format %08X $i]
+        }
+    }
+    return $print
+}
+
+#
+# Check errors for invalid number of arguments
+proc badnumargs {id cmd cmdargs} {
+    variable numargErrors
+    test $id.a "Syntax error: $cmd $cmdargs" \
+        -body [list {*}$cmd {*}$cmdargs] \
+        -result $numargErrors($cmd) \
+        -match regexp \
+        -returnCodes error
+    test $id.b "Syntax error: $cmd (byte compiled)" \
+        -setup [list proc compiled_proc {} [list {*}$cmd {*}$cmdargs]] \
+        -body {compiled_proc} \
+        -cleanup {rename compiled_proc {}} \
+        -result $numargErrors($cmd) \
+        -match regexp \
+        -returnCodes error
+}
+
+# Wraps tests resulting in unknown encoding errors
+proc unknownencodingtest {id cmd} {
+    set result "unknown encoding \"[lindex $cmd end-1]\""
+    test $id.a "Unknown encoding error: $cmd" \
+        -body [list encoding {*}$cmd] \
+        -result $result \
+        -returnCodes error
+    test $id.b "Syntax error: $cmd (byte compiled)" \
+        -setup [list proc encoding_test {} [list encoding {*}$cmd]] \
+        -body {encoding_test} \
+        -cleanup {rename encoding_test {}} \
+        -result $result \
+        -returnCodes error
+}
+
+# Wraps tests for conversion, successful or not.
+# Really more general than just for encoding conversion.
+proc testconvert {id body result args} {
+    test $id.a $body \
+        -body $body \
+        -result $result \
+        {*}$args
+    dict append args -setup \n[list proc compiled_script {} $body]
+    dict append args -cleanup "\nrename compiled_script {}"
+    test $id.b "$body (byte compiled)" \
+        -body {compiled_script} \
+        -result $result \
+        {*}$args
+}
+
+# Wrapper to verify encoding convert{to,from} ?-profile?
+# Generates tests for compiled and uncompiled implementation.
+# Also generates utf-{16,32} tests if passed encoding is utf-{16,32}{le,be}
+# The enc and profile are appended to id to generate the test id
+proc testprofile {id converter enc profile data result args} {
+    testconvert $id.$enc.$profile [list encoding $converter -profile $profile $enc $data] $result {*}$args
+    if {[set enc2 [endianUtf $enc]] ne ""} {
+        # If utf{16,32}-{le,be}, also do utf{16,32}
+        testconvert $id.$enc2.$profile [list encoding $converter -profile $profile $enc2 $data] $result {*}$args
+    }
+
+    # If this is the default profile, generate a test without specifying profile
+    if {$profile eq $::encDefaultProfile} {
+        testconvert $id.$enc.default [list encoding $converter $enc $data] $result {*}$args
+        if {[set enc2 [endianUtf $enc]] ne ""} {
+            # If utf{16,32}-{le,be}, also do utf{16,32}
+            testconvert $id.$enc2.default [list encoding $converter $enc2 $data] $result {*}$args
+        }
+    }
+}
+
+
+# Wrapper to verify encoding convert{to,from} -failindex ?-profile?
+# Generates tests for compiled and uncompiled implementation.
+# Also generates utf-{16,32} tests if passed encoding is utf-{16,32}{le,be}
+# The enc and profile are appended to id to generate the test id
+proc testfailindex {id converter enc data result failidx {profile default}} {
+    testconvert $id.$enc.$profile "list \[encoding $converter -profile $profile -failindex idx $enc [list $data]\] \[set idx\]" [list $result $failidx]
+    if {[set enc2 [endianUtf $enc]] ne ""} {
+        # If utf{16,32}-{le,be}, also do utf{16,32}
+        testconvert $id.$enc2.$profile "list \[encoding $converter -profile $profile -failindex idx $enc2 [list $data]\] \[set idx]" [list $result $failidx]
+    }
+
+    # If this is the default profile, generate a test without specifying profile
+    if {$profile eq $::encDefaultProfile} {
+        testconvert $id.$enc.default "list \[encoding $converter -failindex idx $enc [list $data]\] \[set idx]" [list $result $failidx]
+        if {[set enc2 [endianUtf $enc]] ne ""} {
+            # If utf{16,32}-{le,be}, also do utf{16,32}
+            testconvert $id.$enc2.default "list \[encoding $converter -failindex idx $enc2 [list $data]\] \[set idx]" [list $result $failidx]
+        }
+    }
+}
+
+test cmdAH-4.1.1 {encoding} -returnCodes error -body {
     encoding
 } -result {wrong # args: should be "encoding subcommand ?arg ...?"}
-test cmdAH-4.2 {Tcl_EncodingObjCmd} -returnCodes error -body {
+test cmdAH-4.1.2 {Tcl_EncodingObjCmd} -returnCodes error -body {
     encoding foo
-} -result {unknown or ambiguous subcommand "foo": must be convertfrom, convertto, dirs, names, or system}
-test cmdAH-4.3 {Tcl_EncodingObjCmd} -returnCodes error -body {
-    encoding convertto
-} -result {wrong # args: should be "encoding convertto ?-strict? ?-failindex var? ?encoding? data" or "encoding convertto -nocomplain ?encoding? data"}
-test cmdAH-4.4 {Tcl_EncodingObjCmd} -returnCodes error -body {
-    encoding convertto foo bar
-} -result {unknown encoding "foo"}
-test cmdAH-4.5 {Tcl_EncodingObjCmd} -setup {
+} -result {unknown or ambiguous subcommand "foo": must be convertfrom, convertto, dirs, names, profiles, or system}
+
+#
+# encoding system 4.2.*
+badnumargs cmdAH-4.2.1 {encoding system} {ascii ascii}
+test cmdAH-4.2.2 {Tcl_EncodingObjCmd} -setup {
     set system [encoding system]
 } -body {
-    encoding system jis0208
-    encoding convertto 乎
+    encoding system iso8859-1
+    encoding system
 } -cleanup {
     encoding system $system
-} -result 8C
-test cmdAH-4.6 {Tcl_EncodingObjCmd} -setup {
+} -result iso8859-1
+
+#
+# encoding convertfrom 4.3.*
+
+# Odd number of args is always invalid since last two args
+# are ENCODING DATA and all options take a value
+badnumargs cmdAH-4.3.1 {encoding convertfrom} {}
+badnumargs cmdAH-4.3.2 {encoding convertfrom} {-failindex VAR ABC}
+badnumargs cmdAH-4.3.3 {encoding convertfrom} {-profile VAR ABC}
+badnumargs cmdAH-4.3.4 {encoding convertfrom} {-failindex VAR -profile strict ABC}
+badnumargs cmdAH-4.3.5 {encoding convertfrom} {-profile strict -failindex VAR ABC}
+
+# Test that last two args always treated as ENCODING DATA
+unknownencodingtest cmdAH-4.3.6 {convertfrom -failindex ABC}
+unknownencodingtest cmdAH-4.3.7 {convertfrom -profile ABC}
+unknownencodingtest cmdAH-4.3.8 {convertfrom nosuchencoding ABC}
+unknownencodingtest cmdAH-4.3.9 {convertfrom -failindex VAR -profile ABC}
+unknownencodingtest cmdAH-4.3.10 {convertfrom -profile strict -failindex ABC}
+testconvert cmdAH-4.3.11 {
+    encoding convertfrom jis0208 \x38\x43
+} \u4e4e -setup {
     set system [encoding system]
-} -body {
     encoding system iso8859-1
-    encoding convertto jis0208 乎
 } -cleanup {
     encoding system $system
-} -result 8C
-test cmdAH-4.7 {Tcl_EncodingObjCmd} -returnCodes error -body {
-    encoding convertfrom
-} -result {wrong # args: should be "encoding convertfrom ?-strict? ?-failindex var? ?encoding? data" or "encoding convertfrom -nocomplain ?encoding? data"}
-test cmdAH-4.8 {Tcl_EncodingObjCmd} -returnCodes error -body {
-    encoding convertfrom foo bar
-} -result {unknown encoding "foo"}
-test cmdAH-4.9 {Tcl_EncodingObjCmd} -setup {
+}
+
+# Verify single arg defaults to system encoding
+testconvert cmdAH-4.3.12 {
+    encoding convertfrom \x38\x43
+} \u4e4e -setup {
     set system [encoding system]
-} -body {
     encoding system jis0208
-    encoding convertfrom 8C
 } -cleanup {
     encoding system $system
-} -result 乎
-test cmdAH-4.10 {Tcl_EncodingObjCmd} -setup {
+}
+
+# convertfrom ?-profile? : valid byte sequences
+foreach {enc str hex ctrl comment} $encValidStrings {
+    if {"knownBug" in $ctrl} continue
+    set bytes [binary decode hex $hex]
+    set prefix A
+    set suffix B
+    set prefix_bytes [encoding convertto $enc A]
+    set suffix_bytes [encoding convertto $enc B]
+    foreach profile $encProfiles {
+        testprofile cmdAH-4.3.13.$hex.solo convertfrom $enc $profile $bytes $str
+        testprofile cmdAH-4.3.13.$hex.lead convertfrom $enc $profile $bytes$suffix_bytes $str$suffix
+        testprofile cmdAH-4.3.13.$hex.tail convertfrom $enc $profile $prefix_bytes$bytes $prefix$str
+        testprofile cmdAH-4.3.13.$hex.middle convertfrom $enc $profile $prefix_bytes$bytes$suffix_bytes $prefix$str$suffix
+    }
+}
+
+# convertfrom ?-profile? : invalid byte sequences
+foreach {enc hex profile str failidx ctrl comment} $encInvalidBytes {
+    if {"knownBug" in $ctrl} continue
+    set bytes [binary format H* $hex]
+    set prefix A
+    set suffix B
+    set prefix_bytes [encoding convertto $enc $prefix]
+    set suffix_bytes [encoding convertto $enc $suffix]
+    set prefixLen [string length $prefix_bytes]
+    set result [list $str]
+    # TODO - if the bad byte is unprintable, tcltest errors out when printing a mismatch
+    # so glob it out in error message pattern for now.
+    set errorWithoutPrefix [list "unexpected byte sequence starting at index $failidx: *" -returnCodes error -match glob]
+    set errorWithPrefix [list "unexpected byte sequence starting at index [expr {$failidx+$prefixLen}]: *" -returnCodes error -match glob]
+    if {$ctrl eq {} || "solo" in $ctrl} {
+        if {$failidx == -1} {
+            set result [list $str]
+        } else {
+            set result $errorWithoutPrefix
+        }
+        testprofile cmdAH-4.3.13.$hex.solo convertfrom $enc $profile $bytes {*}$result
+    }
+    if {$ctrl eq {} || "lead" in $ctrl} {
+        if {$failidx == -1} {
+            set result [list $str$suffix]
+        } else {
+            set result $errorWithoutPrefix
+        }
+        testprofile cmdAH-4.3.13.$hex.lead convertfrom $enc $profile $bytes$suffix_bytes {*}$result
+    }
+    if {$ctrl eq {} || "tail" in $ctrl} {
+        if {$failidx == -1} {
+            set result [list $prefix$str]
+        } else {
+            set result $errorWithPrefix
+        }
+        testprofile cmdAH-4.3.13.$hex.tail convertfrom $enc $profile $prefix_bytes$bytes {*}$result
+    }
+    if {$ctrl eq {} || "middle" in $ctrl} {
+        if {$failidx == -1} {
+            set result [list $prefix$str$suffix]
+        } else {
+            set result $errorWithPrefix
+        }
+        testprofile cmdAH-4.3.13.$hex.middle convertfrom $enc $profile $prefix_bytes$bytes$suffix_bytes {*}$result
+    }
+}
+
+# convertfrom -failindex ?-profile? - valid data
+foreach {enc str hex ctrl comment} $encValidStrings {
+    if {"knownBug" in $ctrl} continue
+    set bytes [binary decode hex $hex]
+    set prefix A
+    set suffix B
+    set prefix_bytes [encoding convertto $enc $prefix]
+    set suffix_bytes [encoding convertto $enc $suffix]
+    foreach profile $encProfiles {
+        testfailindex cmdAH-4.3.14.$hex.solo convertfrom $enc $bytes $str -1 $profile
+        testfailindex cmdAH-4.3.14.$hex.lead convertfrom $enc $bytes$suffix_bytes $str$suffix -1 $profile
+        testfailindex cmdAH-4.3.14.$hex.tail convertfrom $enc $prefix_bytes$bytes $prefix$str -1 $profile
+        testfailindex cmdAH-4.3.14.$hex.middle convertfrom $enc $prefix_bytes$bytes$suffix_bytes $prefix$str$suffix -1 $profile
+    }
+}
+
+# convertfrom -failindex ?-profile? - invalid data
+foreach {enc hex profile str failidx ctrl comment} $encInvalidBytes {
+    if {"knownBug" in $ctrl} continue
+    # There are multiple test cases based on location of invalid bytes
+    set bytes [binary decode hex $hex]
+    set prefix A
+    set suffix B
+    set prefix_bytes [encoding convertto $enc $prefix]
+    set suffix_bytes [encoding convertto $enc $suffix]
+    set prefixLen [string length $prefix_bytes]
+    if {$ctrl eq {} || "solo" in $ctrl} {
+        testfailindex cmdAH-4.3.14.$hex.solo convertfrom $enc $bytes $str $failidx $profile
+    }
+    if {$ctrl eq {} || "lead" in $ctrl} {
+        if {$failidx == -1} {
+            # If success expected
+            set result $str$suffix
+        } else {
+            # Failure expected
+            set result ""
+        }
+        testfailindex cmdAH-4.3.14.$hex.lead convertfrom $enc $bytes$suffix_bytes $result $failidx $profile
+    }
+    if {$ctrl eq {} || "tail" in $ctrl} {
+        set expected_failidx $failidx
+        if {$failidx == -1} {
+            # If success expected
+            set result $prefix$str
+        } else {
+            # Failure expected
+            set result $prefix
+            incr expected_failidx $prefixLen
+        }
+        testfailindex cmdAH-4.3.14.$hex.tail convertfrom $enc $prefix_bytes$bytes $result $expected_failidx $profile
+    }
+    if {$ctrl eq {} || "middle" in $ctrl} {
+        set expected_failidx $failidx
+        if {$failidx == -1} {
+            # If success expected
+            set result $prefix$str$suffix
+        } else {
+            # Failure expected
+            set result $prefix
+            incr expected_failidx $prefixLen
+        }
+        testfailindex cmdAH-4.3.14.$hex.middle convertfrom $enc $prefix_bytes$bytes$suffix_bytes $result $expected_failidx $profile
+    }
+}
+
+#
+# encoding convertto 4.4.*
+
+badnumargs cmdAH-4.4.1 {encoding convertto} {}
+badnumargs cmdAH-4.4.2 {encoding convertto} {-failindex VAR ABC}
+badnumargs cmdAH-4.4.3 {encoding convertto} {-profile VAR ABC}
+badnumargs cmdAH-4.4.4 {encoding convertto} {-failindex VAR -profile strict ABC}
+badnumargs cmdAH-4.4.5 {encoding convertto} {-profile strict -failindex VAR ABC}
+
+# Test that last two args always treated as ENCODING DATA
+unknownencodingtest cmdAH-4.4.6 {convertto -failindex ABC}
+unknownencodingtest cmdAH-4.4.7 {convertto -profile ABC}
+unknownencodingtest cmdAH-4.4.8 {convertto nosuchencoding ABC}
+unknownencodingtest cmdAH-4.4.9 {convertto -failindex VAR -profile ABC}
+unknownencodingtest cmdAH-4.4.10 {convertto -profile strict -failindex ABC}
+testconvert cmdAH-4.4.11 {
+    encoding convertto jis0208 \u4e4e
+} \x38\x43 -setup {
     set system [encoding system]
-} -body {
     encoding system iso8859-1
-    encoding convertfrom jis0208 8C
 } -cleanup {
     encoding system $system
-} -result 乎
-test cmdAH-4.11 {Tcl_EncodingObjCmd} -returnCodes error -body {
-    encoding names foo
-} -result {wrong # args: should be "encoding names"}
-test cmdAH-4.12 {Tcl_EncodingObjCmd} -returnCodes error -body {
-    encoding system foo bar
-} -result {wrong # args: should be "encoding system ?encoding?"}
-test cmdAH-4.13 {Tcl_EncodingObjCmd} -setup {
+}
+
+# Verify single arg defaults to system encoding
+testconvert cmdAH-4.4.12 {
+    encoding convertto \u4e4e
+} \x38\x43 -setup {
     set system [encoding system]
-} -body {
-    encoding system iso8859-1
-    encoding system
+    encoding system jis0208
 } -cleanup {
     encoding system $system
-} -result iso8859-1
+}
+
+# convertto ?-profile? : valid byte sequences
 
-test cmdAH-4.14.1 {Syntax error, -nocomplain and -failindex, no encoding} -body {
-    encoding convertfrom -nocomplain -failindex 2 ABC
-} -returnCodes 1 -result {wrong # args: should be "encoding convertfrom ?-strict? ?-failindex var? ?encoding? data" or "encoding convertfrom -nocomplain ?encoding? data"}
-test cmdAH-4.14.2 {Syntax error, -nocomplain and -failindex, no encoding} -body {
-    encoding convertto -nocomplain -failindex 2 ABC
-} -returnCodes 1 -result {wrong # args: should be "encoding convertto ?-strict? ?-failindex var? ?encoding? data" or "encoding convertto -nocomplain ?encoding? data"}
-test cmdAH-4.15.1 {Syntax error, -failindex and -nocomplain, no encoding} -body {
-    encoding convertfrom -failindex 2 -nocomplain ABC
-} -returnCodes 1 -result {unknown encoding "-nocomplain"}
-test cmdAH-4.15.2 {Syntax error, -failindex and -nocomplain, no encoding} -body {
-    encoding convertto -failindex 2 -nocomplain ABC
-} -returnCodes 1 -result {unknown encoding "-nocomplain"}
-test cmdAH-4.16.1 {Syntax error, -nocomplain and -failindex, encoding} -body {
-    encoding convertfrom -nocomplain -failindex 2 utf-8 ABC
-} -returnCodes 1 -result {wrong # args: should be "encoding convertfrom ?-strict? ?-failindex var? ?encoding? data" or "encoding convertfrom -nocomplain ?encoding? data"}
-test cmdAH-4.16.2 {Syntax error, -nocomplain and -failindex, encoding} -body {
-    encoding convertto -nocomplain -failindex 2 utf-8 ABC
-} -returnCodes 1 -result {wrong # args: should be "encoding convertto ?-strict? ?-failindex var? ?encoding? data" or "encoding convertto -nocomplain ?encoding? data"}
-test cmdAH-4.17.1 {Syntax error, -failindex and -nocomplain, encoding} -body {
-    encoding convertfrom -failindex 2 -nocomplain utf-8 ABC
-} -returnCodes 1 -result {wrong # args: should be "encoding convertfrom ?-strict? ?-failindex var? ?encoding? data" or "encoding convertfrom -nocomplain ?encoding? data"}
-test cmdAH-4.17.2 {Syntax error, -failindex and -nocomplain, encoding} -body {
-    encoding convertto -failindex 2 -nocomplain utf-8 ABC
-} -returnCodes 1 -result {wrong # args: should be "encoding convertto ?-strict? ?-failindex var? ?encoding? data" or "encoding convertto -nocomplain ?encoding? data"}
-test cmdAH-4.18.1 {Syntax error, -failindex with no var, no encoding} -body {
-    encoding convertfrom -failindex ABC
-} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertfrom ?-strict? ?-failindex var? ?encoding? data" or "::tcl::encoding::convertfrom -nocomplain ?encoding? data"}
-test cmdAH-4.18.2 {Syntax error, -failindex with no var, no encoding (byte compiled)} -setup {
-    proc encoding_test {} {
-        encoding convertfrom -failindex ABC
+foreach {enc str hex ctrl comment} $encValidStrings {
+    if {"knownBug" in $ctrl} continue
+    set bytes [binary decode hex $hex]
+    set printable [printable $str]
+    set prefix A
+    set suffix B
+    set prefix_bytes [encoding convertto $enc A]
+    set suffix_bytes [encoding convertto $enc B]
+    foreach profile $encProfiles {
+        testprofile cmdAH-4.4.13.$printable.solo convertto $enc $profile $str $bytes
+        testprofile cmdAH-4.4.13.$printable.lead convertto $enc $profile $str$suffix $bytes$suffix_bytes
+        testprofile cmdAH-4.4.13.$printable.tail convertto $enc $profile $prefix$str $prefix_bytes$bytes
+        testprofile cmdAH-4.4.13.$printable.middle convertto $enc $profile $prefix$str$suffix $prefix_bytes$bytes$suffix_bytes
     }
-} -body {
-    # Compile and execute
-    encoding_test
-} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertfrom ?-strict? ?-failindex var? ?encoding? data" or "::tcl::encoding::convertfrom -nocomplain ?encoding? data"} -cleanup {
-    rename encoding_test ""
 }
-test cmdAH-4.18.3 {Syntax error, -failindex with no var, no encoding} -body {
-    encoding convertto -failindex ABC
-} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertto ?-strict? ?-failindex var? ?encoding? data" or "::tcl::encoding::convertto -nocomplain ?encoding? data"}
-test cmdAH-4.18.4 {Syntax error, -failindex with no var, no encoding (byte compiled)} -setup {
-    proc encoding_test {} {
-        encoding convertto -failindex ABC
+
+# convertto ?-profile? : invalid byte sequences
+foreach {enc str profile hex failidx ctrl comment} $encUnencodableStrings {
+    if {"knownBug" in $ctrl} continue
+    set bytes [binary decode hex $hex]
+    set printable [printable $str]
+    set prefix A
+    set suffix B
+    set prefix_bytes [encoding convertto $enc $prefix]
+    set suffix_bytes [encoding convertto $enc $suffix]
+    set prefixLen [string length $prefix_bytes]
+    set result [list $bytes]
+    # TODO - if the bad byte is unprintable, tcltest errors out when printing a mismatch
+    # so glob it out in error message pattern for now.
+    set errorWithoutPrefix [list "unexpected character at index $failidx: *" -returnCodes error -match glob]
+    set errorWithPrefix [list "unexpected character at index [expr {$failidx+$prefixLen}]: *" -returnCodes error -match glob]
+    if {$ctrl eq {} || "solo" in $ctrl} {
+        if {$failidx == -1} {
+            set result [list $bytes]
+        } else {
+            set result $errorWithoutPrefix
+        }
+        testprofile cmdAH-4.4.13.$printable.solo convertto $enc $profile $str {*}$result
     }
-} -body {
-    # Compile and execute
-    encoding_test
-} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertto ?-strict? ?-failindex var? ?encoding? data" or "::tcl::encoding::convertto -nocomplain ?encoding? data"} -cleanup {
-    rename encoding_test ""
-}
-test cmdAH-4.19.1 {convertrom -failindex with correct data} -body {
-    encoding convertfrom -failindex test ABC
-    set test
-} -returnCodes 0 -result -1
-test cmdAH-4.19.2 {convertrom -failindex with correct data (byt compiled)} -setup {
-    proc encoding_test {} {
-	encoding convertfrom -failindex test ABC
-	set test
+    if {$ctrl eq {} || "lead" in $ctrl} {
+        if {$failidx == -1} {
+            set result [list $bytes$suffix_bytes]
+        } else {
+            set result $errorWithoutPrefix
+        }
+        testprofile cmdAH-4.4.13.$printable.lead convertto $enc $profile $str$suffix {*}$result
     }
-} -body {
-    # Compile and execute
-    encoding_test
-} -returnCodes 0 -result -1 -cleanup {
-    rename encoding_test ""
-}
-test cmdAH-4.19.3 {convertrom -failindex with correct data} -body {
-    encoding convertto -failindex test ABC
-    set test
-} -returnCodes 0 -result -1
-test cmdAH-4.19.4 {convertrom -failindex with correct data (byt compiled)} -setup {
-    proc encoding_test {} {
-	encoding convertto -failindex test ABC
-	set test
+    if {$ctrl eq {} || "tail" in $ctrl} {
+        if {$failidx == -1} {
+            set result [list $prefix_bytes$bytes]
+        } else {
+            set result $errorWithPrefix
+        }
+        testprofile cmdAH-4.4.13.$printable.tail convertto $enc $profile $prefix$str {*}$result
     }
-} -body {
-    # Compile and execute
-    encoding_test
-} -returnCodes 0 -result -1 -cleanup {
-    rename encoding_test ""
-}
-test cmdAH-4.20.1 {convertrom -failindex with incomplete utf8} -body {
-    set x [encoding convertfrom -failindex i utf-8 A\xc3]
-    binary scan $x H* y
-    list $y $i
-} -returnCodes 0 -result {41 1}
-test cmdAH-4.20.2 {convertrom -failindex with incomplete utf8 (byte compiled)} -setup {
-    proc encoding_test {} {
-	set x [encoding convertfrom -failindex i utf-8 A\xc3]
-	binary scan $x H* y
-	list $y $i
+    if {$ctrl eq {} || "middle" in $ctrl} {
+        if {$failidx == -1} {
+            set result [list $prefix_bytes$bytes$suffix_bytes]
+        } else {
+            set result $errorWithPrefix
+        }
+        testprofile cmdAH-4.4.13.$printable.middle convertto $enc $profile $prefix$str$suffix {*}$result
     }
-} -body {
-    # Compile and execute
-    encoding_test
-} -returnCodes 0 -result {41 1} -cleanup {
-    rename encoding_test ""
 }
-test cmdAH-4.20.3 {convertrom -failindex with incomplete utf8} -body {
-    set x [encoding convertfrom -strict -failindex i utf-8 A\xc3]
-    binary scan $x H* y
-    list $y $i
-} -returnCodes 0 -result {41 1}
-test cmdAH-4.20.4 {convertrom -failindex with incomplete utf8 (byte compiled)} -setup {
-    proc encoding_test {} {
-	set x [encoding convertfrom -strict -failindex i utf-8 A\xc3]
-	binary scan $x H* y
-	list $y $i
+
+# convertto -failindex ?-profile? - valid data
+foreach {enc str hex ctrl comment} $encValidStrings {
+    if {"knownBug" in $ctrl} continue
+    set bytes [binary decode hex $hex]
+    set printable [printable $str]
+    set prefix A
+    set suffix B
+    set prefix_bytes [encoding convertto $enc A]
+    set suffix_bytes [encoding convertto $enc B]
+    foreach profile $encProfiles {
+        testfailindex cmdAH-4.4.14.$enc.$printable.solo convertto $enc $str $bytes -1 $profile
+        testfailindex cmdAH-4.4.14.$enc.$printable.lead convertto $enc $str$suffix $bytes$suffix_bytes -1 $profile
+        testfailindex cmdAH-4.4.14.$enc.$printable.tail convertto $enc $prefix$str $prefix_bytes$bytes -1 $profile
+        testfailindex cmdAH-4.4.14.$enc.$printable.middle convertto $enc $prefix$str$suffix $prefix_bytes$bytes$suffix_bytes -1 $profile
     }
-} -body {
-    # Compile and execute
-    encoding_test
-} -returnCodes 0 -result {41 1} -cleanup {
-    rename encoding_test ""
 }
-test cmdAH-4.20.5 {convertrom -failindex with incomplete utf8} -body {
-    set x [encoding convertfrom -failindex i -strict utf-8 A\xc3]
-    binary scan $x H* y
-    list $y $i
-} -returnCodes 0 -result {41 1}
-test cmdAH-4.20.6 {convertrom -failindex with incomplete utf8 (byte compiled)} -setup {
-    proc encoding_test {} {
-	set x [encoding convertfrom -failindex i -strict utf-8 A\xc3]
-	binary scan $x H* y
-	list $y $i
+
+# convertto -failindex ?-profile? - invalid data
+foreach {enc str profile hex failidx ctrl comment} $encUnencodableStrings {
+    if {"knownBug" in $ctrl} continue
+    set bytes [binary decode hex $hex]
+    set printable [printable $str]
+    set prefix A
+    set suffix B
+    set prefixLen [string length [encoding convertto $enc $prefix]]
+    if {$ctrl eq {} || "solo" in $ctrl} {
+        testfailindex cmdAH-4.4.14.$printable.solo convertto $enc $str $bytes $failidx $profile
     }
-} -body {
-    # Compile and execute
-    encoding_test
-} -returnCodes 0 -result {41 1} -cleanup {
-    rename encoding_test ""
-}
-test cmdAH-4.21.1 {convertto -failindex with wrong character} -body {
-    set x [encoding convertto -failindex i iso8859-1 A\u0141]
-    binary scan $x H* y
-    list $y $i
-} -returnCodes 0 -result {41 1}
-test cmdAH-4.21.2 {convertto -failindex with wrong character (byte compiled)} -setup {
-    proc encoding_test {} {
-    set x [encoding convertto -failindex i iso8859-1 A\u0141]
-	binary scan $x H* y
-	list $y $i
+    if {$ctrl eq {} || "lead" in $ctrl} {
+        if {$failidx == -1} {
+            # If success expected
+            set result $bytes$suffix
+        } else {
+            # Failure expected
+            set result ""
+        }
+        testfailindex cmdAH-4.4.14.$printable.lead convertto $enc $str$suffix $result $failidx $profile
+    }
+    if {$ctrl eq {} || "tail" in $ctrl} {
+        set expected_failidx $failidx
+        if {$failidx == -1} {
+            # If success expected
+            set result $prefix$bytes
+        } else {
+            # Failure expected
+            set result $prefix
+            incr expected_failidx $prefixLen
+        }
+        testfailindex cmdAH-4.4.14.$printable.tail convertto $enc $prefix$str $result $expected_failidx $profile
+    }
+    if {$ctrl eq {} || "middle" in $ctrl} {
+        set expected_failidx $failidx
+        if {$failidx == -1} {
+            # If success expected
+            set result $prefix$bytes$suffix
+        } else {
+            # Failure expected
+            set result $prefix
+            incr expected_failidx $prefixLen
+        }
+        testfailindex cmdAH-4.4.14.$printable.middle convertto $enc $prefix$str$suffix $result $expected_failidx $profile
     }
-} -body {
-    # Compile and execute
-    encoding_test
-} -returnCodes 0 -result {41 1} -cleanup {
-    rename encoding_test ""
 }
-test cmdAH-4.22 {convertfrom -strict} -body {
-    encoding convertfrom -strict utf-8 A\x00B
-} -result A\x00B
 
-test cmdAH-4.23 {convertfrom -strict} -body {
-    encoding convertfrom -strict utf-8 A\xC0\x80B
-} -returnCodes error -result {unexpected byte sequence starting at index 1: '\xC0'}
+test cmdAH-4.4.xx {convertto -profile strict} -constraints {testbytestring knownBug} -body {
+    # TODO - what does testbytestring even test? Invalid UTF8 in the Tcl_Obj bytes field
+    encoding convertto -profile strict utf-8 A[testbytestring \x80]B
+} -returnCodes error -result {unexpected byte sequence starting at index 1: '\x80'}
 
-test cmdAH-4.24 {convertto -strict} -body {
-    encoding convertto -strict utf-8 A\x00B
-} -result A\x00B
+#
+# encoding names 4.5.*
+badnumargs cmdAH-4.5.1 {encoding names} {foo}
+test cmdAH-4.5.2 {encoding names should include at least utf-8 and iso8859-1 and at least one more} -body {
+    set names [encoding names]
+    list [expr {"utf-8" in $names}] [expr {"iso8859-1" in $names}] [expr {[llength $names] > 2}]
+} -result {1 1 1}
 
-test cmdAH-4.25 {convertfrom -strict} -constraints knownBug -body {
-    encoding convertfrom -strict utf-8 A\x80B
-} -returnCodes error -result {unexpected byte sequence starting at index 1: '\x80'}
+#
+# encoding profiles 4.6.*
+badnumargs cmdAH-4.6.1 {encoding profiles} {foo}
+test cmdAH-4.6.2 {encoding profiles} -body {
+    lsort [encoding profiles]
+} -result {replace strict tcl8}
 
-test cmdAH-4.26 {convertto -strict} -constraints {testbytestring knownBug} -body {
-    encoding convertto -strict utf-8 A[testbytestring \x80]B
-} -returnCodes error -result {unexpected byte sequence starting at index 1: '\x80'}
+#
+# file command
 
 test cmdAH-5.1 {Tcl_FileObjCmd} -returnCodes error -body {
     file
diff --git a/tests/compExpr-old.test b/tests/compExpr-old.test
index 5f705c3..ec7eda1 100644
--- a/tests/compExpr-old.test
+++ b/tests/compExpr-old.test
@@ -78,9 +78,6 @@ proc testIEEE {} {
 }
 testConstraint ieeeFloatingPoint [testIEEE]
 
-testConstraint longIs32bit [expr {$tcl_platform(wordSize) == 4}]
-testConstraint longIs64bit [expr {$tcl_platform(wordSize) == 8}]
-
 # procedures used below
 
 proc put_hello_char {c} {
diff --git a/tests/encoding.test b/tests/encoding.test
index 8b14353..35340a6 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -106,6 +106,14 @@ test encoding-3.2 {Tcl_GetEncodingName, non-null} -setup {
 } -cleanup {
     fconfigure stdout -encoding $old
 } -result {jis0208}
+test encoding-3.3 {fconfigure -profile} -setup {
+    set old [fconfigure stdout -profile]
+} -body {
+    fconfigure stdout -profile replace
+    fconfigure stdout -profile
+} -cleanup {
+    fconfigure stdout -profile $old
+} -result replace
 
 test encoding-4.1 {Tcl_GetEncodingNames} -constraints {testencoding} -setup {
     cd [makeDirectory tmp]
@@ -300,7 +308,7 @@ test encoding-11.11 {encoding: extended Unicode UTF-32} {
 
 test encoding-12.1 {LoadTableEncoding: normal encoding} {
     set x [encoding convertto iso8859-3 Ġ]
-    append x [encoding convertto -nocomplain iso8859-3 Õ]
+    append x [encoding convertto -profile tcl8 iso8859-3 Õ]
     append x [encoding convertfrom iso8859-3 Õ]
 } "Õ?Ġ"
 test encoding-12.2 {LoadTableEncoding: single-byte encoding} {
@@ -339,7 +347,7 @@ test encoding-15.3 {UtfToUtfProc null character input} teststringbytes {
 } c080
 test encoding-15.4 {UtfToUtfProc emoji character input} -body {
     set x \xED\xA0\xBD\xED\xB8\x82
-    set y [encoding convertfrom -nocomplain utf-8 \xED\xA0\xBD\xED\xB8\x82]
+    set y [encoding convertfrom -profile tcl8 utf-8 \xED\xA0\xBD\xED\xB8\x82]
     list [string length $x] $y
 } -result "6 \uD83D\uDE02"
 test encoding-15.5 {UtfToUtfProc emoji character input} {
@@ -349,67 +357,67 @@ test encoding-15.5 {UtfToUtfProc emoji character input} {
 } "4 😂"
 test encoding-15.6 {UtfToUtfProc emoji character output} utf32 {
     set x \uDE02\uD83D\uDE02\uD83D
-    set y [encoding convertto -nocomplain utf-8 \uDE02\uD83D\uDE02\uD83D]
+    set y [encoding convertto -profile tcl8 utf-8 \uDE02\uD83D\uDE02\uD83D]
     binary scan $y H* z
     list [string length $y] $z
 } {12 edb882eda0bdedb882eda0bd}
 test encoding-15.7 {UtfToUtfProc emoji character output} {
     set x \uDE02\uD83D\uD83D
-    set y [encoding convertto -nocomplain utf-8 \uDE02\uD83D\uD83D]
+    set y [encoding convertto -profile tcl8 utf-8 \uDE02\uD83D\uD83D]
     binary scan $y H* z
     list [string length $x] [string length $y] $z
 } {3 9 edb882eda0bdeda0bd}
 test encoding-15.8 {UtfToUtfProc emoji character output} {
     set x \uDE02\uD83Dé
-    set y [encoding convertto -nocomplain utf-8 \uDE02\uD83Dé]
+    set y [encoding convertto -profile tcl8 utf-8 \uDE02\uD83Dé]
     binary scan $y H* z
     list [string length $x] [string length $y] $z
 } {3 8 edb882eda0bdc3a9}
 test encoding-15.9 {UtfToUtfProc emoji character output} {
     set x \uDE02\uD83DX
-    set y [encoding convertto -nocomplain utf-8 \uDE02\uD83DX]
+    set y [encoding convertto -profile tcl8 utf-8 \uDE02\uD83DX]
     binary scan $y H* z
     list [string length $x] [string length $y] $z
 } {3 7 edb882eda0bd58}
 test encoding-15.10 {UtfToUtfProc high surrogate character output} {
     set x \uDE02é
-    set y [encoding convertto -nocomplain utf-8 \uDE02é]
+    set y [encoding convertto -profile tcl8 utf-8 \uDE02é]
     binary scan $y H* z
     list [string length $x] [string length $y] $z
 } {2 5 edb882c3a9}
 test encoding-15.11 {UtfToUtfProc low surrogate character output} {
     set x \uDA02é
-    set y [encoding convertto -nocomplain utf-8 \uDA02é]
+    set y [encoding convertto -profile tcl8 utf-8 \uDA02é]
     binary scan $y H* z
     list [string length $x] [string length $y] $z
 } {2 5 eda882c3a9}
 test encoding-15.12 {UtfToUtfProc high surrogate character output} {
     set x \uDE02Y
-    set y [encoding convertto -nocomplain utf-8 \uDE02Y]
+    set y [encoding convertto -profile tcl8 utf-8 \uDE02Y]
     binary scan $y H* z
     list [string length $x] [string length $y] $z
 } {2 4 edb88259}
 test encoding-15.13 {UtfToUtfProc low surrogate character output} {
     set x \uDA02Y
-    set y [encoding convertto -nocomplain utf-8 \uDA02Y]
+    set y [encoding convertto -profile tcl8 utf-8 \uDA02Y]
     binary scan $y H* z
     list [string length $x] [string length $y] $z
 } {2 4 eda88259}
 test encoding-15.14 {UtfToUtfProc high surrogate character output} {
     set x \uDE02
-    set y [encoding convertto -nocomplain utf-8 \uDE02]
+    set y [encoding convertto -profile tcl8 utf-8 \uDE02]
     binary scan $y H* z
     list [string length $x] [string length $y] $z
 } {1 3 edb882}
 test encoding-15.15 {UtfToUtfProc low surrogate character output} {
     set x \uDA02
-    set y [encoding convertto -nocomplain utf-8 \uDA02]
+    set y [encoding convertto -profile tcl8 utf-8 \uDA02]
     binary scan $y H* z
     list [string length $x] [string length $y] $z
 } {1 3 eda882}
 test encoding-15.16 {UtfToUtfProc: Invalid 4-byte UTF-8, see [ed29806ba]} {
     set x \xF0\xA0\xA1\xC2
-    set y [encoding convertfrom -nocomplain utf-8 \xF0\xA0\xA1\xC2]
+    set y [encoding convertfrom -profile tcl8 utf-8 \xF0\xA0\xA1\xC2]
     list [string length $x] $y
 } "4 \xF0\xA0\xA1\xC2"
 test encoding-15.17 {UtfToUtfProc emoji character output} {
@@ -459,20 +467,20 @@ test encoding-15.25 {UtfToUtfProc CESU-8} {
 test encoding-15.26 {UtfToUtfProc CESU-8} {
     encoding convertfrom cesu-8 \xC0\x80
 } \x00
-test encoding-15.27 {UtfToUtfProc -strict CESU-8} {
-    encoding convertfrom -strict cesu-8 \x00
+test encoding-15.27 {UtfToUtfProc -profile strict CESU-8} {
+    encoding convertfrom -profile strict cesu-8 \x00
 } \x00
-test encoding-15.28 {UtfToUtfProc -strict CESU-8} -body {
-    encoding convertfrom -strict cesu-8 \xC0\x80
+test encoding-15.28 {UtfToUtfProc -profile strict CESU-8} -body {
+    encoding convertfrom -profile strict cesu-8 \xC0\x80
 } -returnCodes 1 -result {unexpected byte sequence starting at index 0: '\xC0'}
 test encoding-15.29 {UtfToUtfProc CESU-8} {
     encoding convertto cesu-8 \x00
 } \x00
-test encoding-15.30 {UtfToUtfProc -strict CESU-8} {
-    encoding convertto -strict cesu-8 \x00
+test encoding-15.30 {UtfToUtfProc -profile strict CESU-8} {
+    encoding convertto -profile strict cesu-8 \x00
 } \x00
-test encoding-15.31 {UtfToUtfProc -strict CESU-8 (bytes F0-F4 are invalid)} -body {
-    encoding convertfrom -strict cesu-8 \xF1\x86\x83\x9C
+test encoding-15.31 {UtfToUtfProc -profile strict CESU-8 (bytes F0-F4 are invalid)} -body {
+    encoding convertfrom -profile strict cesu-8 \xF1\x86\x83\x9C
 } -returnCodes 1 -result {unexpected byte sequence starting at index 0: '\xF1'}
 
 test encoding-16.1 {Utf16ToUtfProc} -body {
@@ -504,7 +512,7 @@ test encoding-16.7 {Utf32ToUtfProc} -body {
     list $val [format %x [scan $val %c]]
 } -result "乎 4e4e"
 test encoding-16.8 {Utf32ToUtfProc} -body {
-    set val [encoding convertfrom -nocomplain utf-32 \x41\x00\x00\x41]
+    set val [encoding convertfrom -profile tcl8 utf-32 \x41\x00\x00\x41]
     list $val [format %x [scan $val %c]]
 } -result "\uFFFD fffd"
 test encoding-16.9 {Utf32ToUtfProc} -constraints utf32 -body {
@@ -532,7 +540,7 @@ test encoding-16.16 {Utf16ToUtfProc} -body {
     encoding convertfrom utf-16le \x00\xDC\x00\xD8
 } -result \uDC00\uD800
 test encoding-16.17 {Utf32ToUtfProc} -body {
-    list [encoding convertfrom -strict -failindex  idx utf-32le \x41\x00\x00\x00\x00\xD8\x00\x00\x42\x00\x00\x00] [set idx]
+    list [encoding convertfrom -profile strict -failindex  idx utf-32le \x41\x00\x00\x00\x00\xD8\x00\x00\x42\x00\x00\x00] [set idx]
 } -result {A 4}
 
 test encoding-16.18 {
@@ -554,15 +562,27 @@ test encoding-16.18 {
 	return done
     } [namespace current]]
 } -result done
-test encoding-16.19 {UnicodeToUtfProc, bug [d19fe0a5b]} -body {
+test encoding-16.19 {Utf16ToUtfProc, bug [d19fe0a5b]} -body {
     encoding convertfrom utf-16 "\x41\x41\x41"
 } -result \u4141\uFFFD
-test encoding-16.20 {UnicodeToUtfProc, bug [d19fe0a5b]} -constraints deprecated -body {
+test encoding-16.20 {Utf16ToUtfProc, bug [d19fe0a5b]} -constraints deprecated -body {
     encoding convertfrom utf-16 "\xD8\xD8"
 } -result \uD8D8
-test encoding-16.21 {UnicodeToUtfProc, bug [d19fe0a5b]} -body {
+test encoding-16.21 {Utf16ToUtfProc, bug [d19fe0a5b]} -body {
     encoding convertfrom utf-32 "\x00\x00\x00\x00\x41\x41"
 } -result \x00\uFFFD
+test encoding-16.22 {Utf16ToUtfProc, strict, bug [db7a085bd9]} -body {
+    encoding convertfrom -profile strict utf-16le \x00\xD8
+} -returnCodes 1 -result {unexpected byte sequence starting at index 0: '\x00'}
+test encoding-16.23 {Utf16ToUtfProc, strict, bug [db7a085bd9]} -body {
+    encoding convertfrom -profile strict utf-16le \x00\xDC
+} -returnCodes 1 -result {unexpected byte sequence starting at index 0: '\x00'}
+test encoding-16.24 {Utf32ToUtfProc} -body {
+    encoding convertfrom utf-32 "\xFF\xFF\xFF\xFF"
+} -result \uFFFD
+test encoding-16.25 {Utf32ToUtfProc} -body {
+    encoding convertfrom utf-32 "\x01\x00\x00\x01"
+} -result \uFFFD
 
 test encoding-17.1 {UtfToUtf16Proc} -body {
     encoding convertto utf-16 "\U460DC"
@@ -571,10 +591,10 @@ test encoding-17.2 {UtfToUcs2Proc} -body {
     encoding convertfrom utf-16 \xD8\xD8\xDC\xDC
 } -result "\U460DC"
 test encoding-17.3 {UtfToUtf16Proc} -body {
-    encoding convertto -nocomplain utf-16be "\uDCDC"
+    encoding convertto -profile tcl8 utf-16be "\uDCDC"
 } -result "\xDC\xDC"
 test encoding-17.4 {UtfToUtf16Proc} -body {
-    encoding convertto -nocomplain utf-16le "\uD8D8"
+    encoding convertto -profile tcl8 utf-16le "\uD8D8"
 } -result "\xD8\xD8"
 test encoding-17.5 {UtfToUtf16Proc} -body {
     encoding convertto utf-32le "\U460DC"
@@ -583,54 +603,60 @@ test encoding-17.6 {UtfToUtf16Proc} -body {
     encoding convertto utf-32be "\U460DC"
 } -result "\x00\x04\x60\xDC"
 test encoding-17.7 {UtfToUtf16Proc} -body {
-    encoding convertto -strict utf-16be "\uDCDC"
+    encoding convertto -profile strict utf-16be "\uDCDC"
 } -returnCodes error -result {unexpected character at index 0: 'U+00DCDC'}
 test encoding-17.8 {UtfToUtf16Proc} -body {
-    encoding convertto -strict utf-16le "\uD8D8"
+    encoding convertto -profile strict utf-16le "\uD8D8"
 } -returnCodes error -result {unexpected character at index 0: 'U+00D8D8'}
 test encoding-17.9 {Utf32ToUtfProc} -body {
-    encoding convertfrom -strict utf-32 "\xFF\xFF\xFF\xFF"
+    encoding convertfrom -profile strict utf-32 "\xFF\xFF\xFF\xFF"
 } -returnCodes error -result {unexpected byte sequence starting at index 0: '\xFF'}
 test encoding-17.10 {Utf32ToUtfProc} -body {
-    encoding convertfrom -nocomplain utf-32 "\xFF\xFF\xFF\xFF"
+    encoding convertfrom -profile tcl8 utf-32 "\xFF\xFF\xFF\xFF"
 } -result \uFFFD
+test encoding-17.11 {Utf32ToUtfProc} -body {
+    encoding convertfrom -profile strict utf-32le "\x00\xD8\x00\x00"
+} -returnCodes error -result {unexpected byte sequence starting at index 0: '\x00'}
+test encoding-17.12 {Utf32ToUtfProc} -body {
+    encoding convertfrom -profile strict utf-32le "\x00\xDC\x00\x00"
+} -returnCodes error -result {unexpected byte sequence starting at index 0: '\x00'}
 
 test encoding-18.1 {TableToUtfProc on invalid input} -body {
 	list [catch {encoding convertto jis0208 \\} res] $res
+} -result {0 !)}
+test encoding-18.2 {TableToUtfProc on invalid input with -profile strict} -body {
+	list [catch {encoding convertto -profile strict jis0208 \\} res] $res
 } -result {1 {unexpected character at index 0: 'U+00005C'}}
-test encoding-18.2 {TableToUtfProc on invalid input with -strict} -body {
-	list [catch {encoding convertto -strict jis0208 \\} res] $res
-} -result {1 {unexpected character at index 0: 'U+00005C'}}
-test encoding-18.3 {TableToUtfProc on invalid input with -strict -failindex} -body {
-	list [catch {encoding convertto -strict -failindex pos jis0208 \\} res] $res $pos
+test encoding-18.3 {TableToUtfProc on invalid input with -profile strict -failindex} -body {
+	list [catch {encoding convertto -profile strict -failindex pos jis0208 \\} res] $res $pos
 } -result {0 {} 0}
-test encoding-18.4 {TableToUtfProc on invalid input with -failindex -strict} -body {
-	list [catch {encoding convertto -failindex pos -strict jis0208 \\} res] $res $pos
+test encoding-18.4 {TableToUtfProc on invalid input with -failindex -profile strict} -body {
+	list [catch {encoding convertto -failindex pos -profile strict jis0208 \\} res] $res $pos
 } -result {0 {} 0}
 test encoding-18.5 {TableToUtfProc on invalid input with -failindex} -body {
 	list [catch {encoding convertto -failindex pos jis0208 \\} res] $res $pos
-} -result {0 {} 0}
-test encoding-18.6 {TableToUtfProc on invalid input with -nocomplain} -body {
-	list [catch {encoding convertto -nocomplain jis0208 \\} res] $res
+} -result {0 !) -1}
+test encoding-18.6 {TableToUtfProc on invalid input with -profile tcl8} -body {
+	list [catch {encoding convertto -profile tcl8 jis0208 \\} res] $res
 } -result {0 !)}
 
 test encoding-19.1 {TableFromUtfProc} -body {
     encoding convertfrom ascii AÁ
 } -result AÁ
 test encoding-19.2 {TableFromUtfProc} -body {
-    encoding convertfrom -nocomplain ascii AÁ
+    encoding convertfrom -profile tcl8 ascii AÁ
 } -result AÁ
 test encoding-19.3 {TableFromUtfProc} -body {
-    encoding convertfrom -strict ascii AÁ
+    encoding convertfrom -profile strict ascii AÁ
 } -returnCodes 1 -result {unexpected byte sequence starting at index 1: '\xC1'}
 test encoding-19.4 {TableFromUtfProc} -body {
     list [encoding convertfrom -failindex idx ascii AÁ] [set idx]
-} -result {A 1}
+} -result [list A\xC1 -1]
 test encoding-19.5 {TableFromUtfProc} -body {
-    list [encoding convertfrom -failindex idx -strict ascii AÁ] [set idx]
+    list [encoding convertfrom -failindex idx -profile strict ascii A\xC1] [set idx]
 } -result {A 1}
 test encoding-19.6 {TableFromUtfProc} -body {
-    list [encoding convertfrom -failindex idx -strict ascii AÁB] [set idx]
+    list [encoding convertfrom -failindex idx -profile strict ascii AÁB] [set idx]
 } -result {A 1}
 
 test encoding-20.1 {TableFreefProc} {
@@ -743,31 +769,31 @@ test encoding-24.4 {Parse valid or invalid utf-8} {
     string length [encoding convertfrom utf-8 "\xC0\x80"]
 } 1
 test encoding-24.5 {Parse valid or invalid utf-8} {
-    string length [encoding convertfrom -nocomplain utf-8 "\xC0\x81"]
+    string length [encoding convertfrom -profile tcl8 utf-8 "\xC0\x81"]
 } 2
 test encoding-24.6 {Parse valid or invalid utf-8} {
-    string length [encoding convertfrom -nocomplain utf-8 "\xC1\xBF"]
+    string length [encoding convertfrom -profile tcl8 utf-8 "\xC1\xBF"]
 } 2
 test encoding-24.7 {Parse valid or invalid utf-8} {
     string length [encoding convertfrom utf-8 "\xC2\x80"]
 } 1
 test encoding-24.8 {Parse valid or invalid utf-8} {
-    string length [encoding convertfrom -nocomplain utf-8 "\xE0\x80\x80"]
+    string length [encoding convertfrom -profile tcl8 utf-8 "\xE0\x80\x80"]
 } 3
 test encoding-24.9 {Parse valid or invalid utf-8} {
-    string length [encoding convertfrom -nocomplain utf-8 "\xE0\x9F\xBF"]
+    string length [encoding convertfrom -profile tcl8 utf-8 "\xE0\x9F\xBF"]
 } 3
 test encoding-24.10 {Parse valid or invalid utf-8} {
     string length [encoding convertfrom utf-8 "\xE0\xA0\x80"]
 } 1
 test encoding-24.11 {Parse valid or invalid utf-8} {
-    string length [encoding convertfrom -nocomplain utf-8 "\xEF\xBF\xBF"]
+    string length [encoding convertfrom -profile tcl8 utf-8 "\xEF\xBF\xBF"]
 } 1
 test encoding-24.12 {Parse valid or invalid utf-8} -body {
-    encoding convertfrom -strict utf-8 "\xC0\x81"
+    encoding convertfrom -profile strict utf-8 "\xC0\x81"
 } -returnCodes 1 -result {unexpected byte sequence starting at index 0: '\xC0'}
 test encoding-24.13 {Parse valid or invalid utf-8} -body {
-    encoding convertfrom -strict utf-8 "\xC1\xBF"
+    encoding convertfrom -profile strict utf-8 "\xC1\xBF"
 } -returnCodes 1 -result {unexpected byte sequence starting at index 0: '\xC1'}
 test encoding-24.14 {Parse valid or invalid utf-8} {
     string length [encoding convertfrom utf-8 "\xC2\x80"]
@@ -784,86 +810,92 @@ test encoding-24.17 {Parse valid or invalid utf-8} -constraints testbytestring -
 test encoding-24.18 {Parse valid or invalid utf-8} -constraints testbytestring -body {
     encoding convertto utf-8 [testbytestring "Z\xE0\x80xxxxxx"]
 } -result "Z\xC3\xA0\xE2\x82\xACxxxxxx"
-test encoding-24.19 {Parse valid or invalid utf-8} -body {
-    encoding convertto utf-8 "ZX\uD800"
+test encoding-24.19.1 {Parse valid or invalid utf-8} -body {
+    encoding convertto -profile tcl8 utf-8 "ZX\uD800"
+} -result ZX\xED\xA0\x80
+test encoding-24.19.2 {Parse valid or invalid utf-8} -body {
+    encoding convertto -profile strict utf-8 "ZX\uD800"
 } -returnCodes 1 -match glob -result "unexpected character at index 2: 'U+00D800'"
-test encoding-24.20 {Parse with -nocomplain but without providing encoding} {
-    string length [encoding convertfrom -nocomplain "\x20"]
-} 1
-test encoding-24.21 {Parse with -nocomplain but without providing encoding} {
-    string length [encoding convertto -nocomplain "\x20"]
-} 1
+test encoding-24.20 {Parse with -profile tcl8 but without providing encoding} -body {
+    encoding convertfrom -profile tcl8 "\x20"
+} -result {wrong # args: should be "::tcl::encoding::convertfrom ?-profile profile? ?-failindex var? encoding data" or "::tcl::encoding::convertfrom data"} -returnCodes error
+test encoding-24.21 {Parse with -profile tcl8 but without providing encoding} -body {
+    string length [encoding convertto -profile tcl8 "\x20"]
+} -result {wrong # args: should be "::tcl::encoding::convertto ?-profile profile? ?-failindex var? encoding data" or "::tcl::encoding::convertto data"} -returnCodes error
 test encoding-24.22 {Syntax error, two encodings} -body {
     encoding convertfrom iso8859-1 utf-8 "ZX\uD800"
-} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertfrom ?-strict? ?-failindex var? ?encoding? data" or "::tcl::encoding::convertfrom -nocomplain ?encoding? data"}
+} -result {bad option "iso8859-1": must be -profile or -failindex} -returnCodes error
 test encoding-24.23 {Syntax error, two encodings} -body {
     encoding convertto iso8859-1 utf-8 "ZX\uD800"
-} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertto ?-strict? ?-failindex var? ?encoding? data" or "::tcl::encoding::convertto -nocomplain ?encoding? data"}
-test encoding-24.24 {Parse invalid utf-8 with -strict} -body {
-    encoding convertfrom -strict utf-8 "\xC0\x80\x00\x00"
+} -result {bad option "iso8859-1": must be -profile or -failindex} -returnCodes error
+test encoding-24.24 {Parse invalid utf-8 with -profile strict} -body {
+    encoding convertfrom -profile strict utf-8 "\xC0\x80\x00\x00"
 } -returnCodes 1 -result {unexpected byte sequence starting at index 0: '\xC0'}
-test encoding-24.25 {Parse invalid utf-8 with -strict} -body {
-    encoding convertfrom -strict utf-8 "\x40\x80\x00\x00"
+test encoding-24.25 {Parse invalid utf-8 with -profile strict} -body {
+    encoding convertfrom -profile strict utf-8 "\x40\x80\x00\x00"
 } -returnCodes 1 -result {unexpected byte sequence starting at index 1: '\x80'}
-test encoding-24.26 {Parse valid utf-8 with -strict} -body {
-    encoding convertfrom -strict utf-8 "\xF1\x80\x80\x80"
+test encoding-24.26 {Parse valid utf-8 with -profile strict} -body {
+    encoding convertfrom -profile strict utf-8 "\xF1\x80\x80\x80"
 } -result \U40000
-test encoding-24.27 {Parse invalid utf-8 with -strict} -body {
-    encoding convertfrom -strict utf-8 "\xF0\x80\x80\x80"
+test encoding-24.27 {Parse invalid utf-8 with -profile strict} -body {
+    encoding convertfrom -profile strict utf-8 "\xF0\x80\x80\x80"
 } -returnCodes 1 -result {unexpected byte sequence starting at index 0: '\xF0'}
-test encoding-24.28 {Parse invalid utf-8 with -strict} -body {
-    encoding convertfrom -strict utf-8 "\xFF\x00\x00"
+test encoding-24.28 {Parse invalid utf-8 with -profile strict} -body {
+    encoding convertfrom -profile strict utf-8 "\xFF\x00\x00"
 } -returnCodes 1 -result {unexpected byte sequence starting at index 0: '\xFF'}
 test encoding-24.29 {Parse invalid utf-8} -body {
     encoding convertfrom utf-8 \xEF\xBF\xBF
 } -result \uFFFF
-test encoding-24.30 {Parse noncharacter with -strict} -body {
-    encoding convertfrom -strict utf-8 \xEF\xBF\xBF
+test encoding-24.30 {Parse noncharacter with -profile strict} -body {
+    encoding convertfrom -profile strict utf-8 \xEF\xBF\xBF
 } -result \uFFFF
-test encoding-24.31 {Parse invalid utf-8 with -nocomplain} -body {
-    encoding convertfrom -nocomplain utf-8 \xEF\xBF\xBF
+test encoding-24.31 {Parse invalid utf-8 with -profile tcl8} -body {
+    encoding convertfrom -profile tcl8 utf-8 \xEF\xBF\xBF
 } -result \uFFFF
 test encoding-24.32 {Try to generate invalid utf-8} -body {
     encoding convertto utf-8 \uFFFF
 } -result \xEF\xBF\xBF
-test encoding-24.33 {Try to generate noncharacter with -strict} -body {
-    encoding convertto -strict utf-8 \uFFFF
+test encoding-24.33 {Try to generate noncharacter with -profile strict} -body {
+    encoding convertto -profile strict utf-8 \uFFFF
 } -result \xEF\xBF\xBF
-test encoding-24.34 {Try to generate invalid utf-8 with -nocomplain} -body {
-    encoding convertto -nocomplain utf-8 \uFFFF
+test encoding-24.34 {Try to generate invalid utf-8 with -profile tcl8} -body {
+    encoding convertto -profile tcl8 utf-8 \uFFFF
 } -result \xEF\xBF\xBF
 test encoding-24.35 {Parse invalid utf-8} -constraints utf32 -body {
     encoding convertfrom utf-8 \xED\xA0\x80
 } -result \uD800
-test encoding-24.36 {Parse invalid utf-8 with -strict} -body {
-    encoding convertfrom -strict utf-8 \xED\xA0\x80
+test encoding-24.36 {Parse invalid utf-8 with -profile strict} -body {
+    encoding convertfrom -profile strict utf-8 \xED\xA0\x80
 } -returnCodes 1 -result {unexpected byte sequence starting at index 0: '\xED'}
-test encoding-24.37 {Parse invalid utf-8 with -nocomplain} -body {
-    encoding convertfrom -nocomplain utf-8 \xED\xA0\x80
+test encoding-24.37 {Parse invalid utf-8 with -profile tcl8} -body {
+    encoding convertfrom -profile tcl8 utf-8 \xED\xA0\x80
 } -result \uD800
-test encoding-24.38 {Try to generate invalid utf-8} -body {
-    encoding convertto utf-8 \uD800
+test encoding-24.38.1 {Try to generate invalid utf-8} -body {
+    encoding convertto -profile tcl8 utf-8 \uD800
+} -result \xED\xA0\x80
+test encoding-24.38.2 {Try to generate invalid utf-8} -body {
+    encoding convertto -profile strict utf-8 \uD800
 } -returnCodes 1 -result {unexpected character at index 0: 'U+00D800'}
-test encoding-24.39 {Try to generate invalid utf-8 with -strict} -body {
-    encoding convertto -strict utf-8 \uD800
+test encoding-24.39 {Try to generate invalid utf-8 with -profile strict} -body {
+    encoding convertto -profile strict utf-8 \uD800
 } -returnCodes 1 -result {unexpected character at index 0: 'U+00D800'}
-test encoding-24.40 {Try to generate invalid utf-8 with -nocomplain} -body {
-    encoding convertto -nocomplain utf-8 \uD800
+test encoding-24.40 {Try to generate invalid utf-8 with -profile tcl8} -body {
+    encoding convertto -profile tcl8 utf-8 \uD800
 } -result \xED\xA0\x80
-test encoding-24.41 {Parse invalid utf-8 with -strict} -body {
-    encoding convertfrom -strict utf-8 \xED\xA0\x80\xED\xB0\x80
+test encoding-24.41 {Parse invalid utf-8 with -profile strict} -body {
+    encoding convertfrom -profile strict utf-8 \xED\xA0\x80\xED\xB0\x80
 } -returnCodes 1 -result {unexpected byte sequence starting at index 0: '\xED'}
 test encoding-24.42 {Parse invalid utf-8, fallback to cp1252 [885c86a9a0]} -body {
-    encoding convertfrom -nocomplain utf-8 \xF0\x80\x80\x80
+    encoding convertfrom -profile tcl8 utf-8 \xF0\x80\x80\x80
 } -result \xF0\u20AC\u20AC\u20AC
 test encoding-24.43 {Parse invalid utf-8, fallback to cp1252 [885c86a9a0]} -body {
-    encoding convertfrom -nocomplain utf-8 \x80
+    encoding convertfrom -profile tcl8 utf-8 \x80
 } -result \u20AC
-test encoding-24.44 {Try to generate invalid ucs-2 with -strict} -body {
-    encoding convertto -strict ucs-2 \uD800
+test encoding-24.44 {Try to generate invalid ucs-2 with -profile strict} -body {
+    encoding convertto -profile strict ucs-2 \uD800
 } -returnCodes 1 -result {unexpected character at index 0: 'U+00D800'}
-test encoding-24.45 {Try to generate invalid ucs-2 with -strict} -body {
-    encoding convertto -strict ucs-2 \U10000
+test encoding-24.45 {Try to generate invalid ucs-2 with -profile strict} -body {
+    encoding convertto -profile strict ucs-2 \U10000
 } -returnCodes 1 -result {unexpected character at index 0: 'U+010000'}
 
 file delete [file join [temporaryDirectory] iso2022.txt]
@@ -1022,7 +1054,7 @@ test encoding-28.0 {all encodings load} -body {
 		if {$name ne "unicode"} {
 		    incr count
 		}
-		encoding convertto -nocomplain $name $string
+		encoding convertto -profile tcl8 $name $string
 
 		# discard the cached internal representation of Tcl_Encoding
 		# Unfortunately, without this, encoding 2-1 fails.
@@ -1033,6 +1065,44 @@ test encoding-28.0 {all encodings load} -body {
 
 runtests
 
+test encoding-bug-183a1adcc0-1 {Bug [183a1adcc0] Buffer overflow Tcl_UtfToExternal} -constraints {
+    testencoding
+} -body {
+    # Note - buffers are initialized to \xff
+    list [catch {testencoding Tcl_UtfToExternal utf-16 A {start end} {} 1} result] $result
+} -result [list 0 [list nospace {} \xff]]
+
+test encoding-bug-183a1adcc0-2 {Bug [183a1adcc0] Buffer overflow Tcl_UtfToExternal} -constraints {
+    testencoding
+} -body {
+    # Note - buffers are initialized to \xff
+    list [catch {testencoding Tcl_UtfToExternal utf-16 A {start end} {} 0} result] $result
+} -result [list 0 [list nospace {} {}]]
+
+test encoding-bug-183a1adcc0-3 {Bug [183a1adcc0] Buffer overflow Tcl_UtfToExternal} -constraints {
+    testencoding
+} -body {
+    # Note - buffers are initialized to \xff
+    list [catch {testencoding Tcl_UtfToExternal utf-16 A {start end} {} 2} result] $result
+} -result [list 0 [list nospace {} \x00\x00]]
+
+test encoding-bug-183a1adcc0-4 {Bug [183a1adcc0] Buffer overflow Tcl_UtfToExternal} -constraints {
+    testencoding
+} -body {
+    # Note - buffers are initialized to \xff
+    list [catch {testencoding Tcl_UtfToExternal utf-16 A {start end} {} 3} result] $result
+} -result [list 0 [list nospace {} \x00\x00\xff]]
+
+test encoding-bug-183a1adcc0-5 {Bug [183a1adcc0] Buffer overflow Tcl_UtfToExternal} -constraints {
+    testencoding ucs2 knownBug
+} -body {
+    # The knownBug constraint is because test depends on TCL_UTF_MAX and
+    # also UtfToUtf16 assumes space required in destination buffer is
+    # sizeof(Tcl_UniChar) which is incorrect when TCL_UTF_MAX==4
+    # Note - buffers are initialized to \xff
+    list [catch {testencoding Tcl_UtfToExternal utf-16 A {start end} {} 4} result] $result
+} -result [list 0 [list ok {} [expr {$::tcl_platform(byteOrder) eq "littleEndian" ? "\x41\x00" : "\x00\x41"}]\x00\x00]]
+
 }
 
 test encoding-29.0 {get encoding nul terminator lengths} -constraints {
diff --git a/tests/encodingVectors.tcl b/tests/encodingVectors.tcl
new file mode 100644
index 0000000..1b569a1
--- /dev/null
+++ b/tests/encodingVectors.tcl
@@ -0,0 +1,655 @@
+# This file contains test vectors for verifying various encodings. They are
+# stored in a common file so that they can be sourced into the various test
+# modules that are dependent on encodings. This file contains statically defined
+# test vectors. In addition, it sources the ICU-generated test vectors from
+# icuUcmTests.tcl.
+#
+# Note that sourcing the file will reinitialize any existing encoding test
+# vectors.
+#
+
+# List of defined encoding profiles
+set encProfiles {tcl8 strict replace}
+set encDefaultProfile tcl8; # Should reflect the default from implementation
+
+# encValidStrings - Table of valid strings.
+#
+# Each row is <ENCODING STR BYTES CTRL COMMENT>
+# The pair <ENCODING,STR> should be unique for generated test ids to be unique.
+# STR is a string that can be encoded in the encoding ENCODING resulting
+# in the byte sequence BYTES. The CTRL field is a list that controls test
+# generation. It may contain zero or more of `solo`, `lead`, `tail` and
+# `middle` indicating that the generated tests should include the string
+# by itself, as the lead of a longer string, as the tail of a longer string
+# and in the middle of a longer string. If CTRL is empty, it is treated as
+# containing all four of the above. The CTRL field may also contain the
+# words knownBug or knownW3C which will cause the test generation for that
+# vector to be skipped.
+#
+# utf-16, utf-32 missing because they are automatically
+# generated based on le/be versions.
+set encValidStrings {}; # Reset the table
+
+lappend encValidStrings {*}{
+    ascii    \u0000 00 {} {Lowest ASCII}
+    ascii    \u007F 7F knownBug {Highest ASCII}
+    ascii    \u007D 7D {} {Brace - just to verify test scripts are escaped correctly}
+    ascii    \u007B 7B {} {Terminating brace - just to verify test scripts are escaped correctly}
+
+    utf-8    \u0000 00 {} {Unicode Table 3.7 Row 1}
+    utf-8    \u007F 7F {} {Unicode Table 3.7 Row 1}
+    utf-8    \u0080 C280 {} {Unicode Table 3.7 Row 2}
+    utf-8    \u07FF DFBF {} {Unicode Table 3.7 Row 2}
+    utf-8    \u0800 E0A080 {} {Unicode Table 3.7 Row 3}
+    utf-8    \u0FFF E0BFBF {} {Unicode Table 3.7 Row 3}
+    utf-8    \u1000 E18080 {} {Unicode Table 3.7 Row 4}
+    utf-8    \uCFFF ECBFBF {} {Unicode Table 3.7 Row 4}
+    utf-8    \uD000 ED8080 {} {Unicode Table 3.7 Row 5}
+    utf-8    \uD7FF ED9FBF {} {Unicode Table 3.7 Row 5}
+    utf-8    \uE000 EE8080 {} {Unicode Table 3.7 Row 6}
+    utf-8    \uFFFF EFBFBF {} {Unicode Table 3.7 Row 6}
+    utf-8    \U10000 F0908080 {} {Unicode Table 3.7 Row 7}
+    utf-8    \U3FFFF F0BFBFBF {} {Unicode Table 3.7 Row 7}
+    utf-8    \U40000 F1808080 {} {Unicode Table 3.7 Row 8}
+    utf-8    \UFFFFF F3BFBFBF {} {Unicode Table 3.7 Row 8}
+    utf-8    \U100000 F4808080 {} {Unicode Table 3.7 Row 9}
+    utf-8    \U10FFFF F48FBFBF {} {Unicode Table 3.7 Row 9}
+    utf-8    A\u03A9\u8A9E\U00010384 41CEA9E8AA9EF0908E84 {} {Unicode 2.5}
+
+    utf-16le \u0000 0000 {} {Lowest code unit}
+    utf-16le \uD7FF FFD7 {} {Below high surrogate range}
+    utf-16le \uE000 00E0 {} {Above low surrogate range}
+    utf-16le \uFFFF FFFF {} {Highest code unit}
+    utf-16le \U010000 00D800DC {} {First surrogate pair}
+    utf-16le \U10FFFF FFDBFFDF {} {First surrogate pair}
+    utf-16le A\u03A9\u8A9E\U00010384 4100A9039E8A00D884DF {} {Unicode 2.5}
+
+    utf-16be \u0000 0000 {} {Lowest code unit}
+    utf-16be \uD7FF D7FF {} {Below high surrogate range}
+    utf-16be \uE000 E000 {} {Above low surrogate range}
+    utf-16be \uFFFF FFFF {} {Highest code unit}
+    utf-16be \U010000 D800DC00 {} {First surrogate pair}
+    utf-16be \U10FFFF DBFFDFFF {} {First surrogate pair}
+    utf-16be A\u03A9\u8A9E\U00010384 004103A98A9ED800DF84 {} {Unicode 2.5}
+
+    utf-32le \u0000 00000000 {} {Lowest code unit}
+    utf-32le \uFFFF FFFF0000 {} {Highest BMP}
+    utf-32le \U010000 00000100 {} {First supplementary}
+    utf-32le \U10FFFF ffff1000 {} {Last supplementary}
+    utf-32le A\u03A9\u8A9E\U00010384 41000000A90300009E8A000084030100 {} {Unicode 2.5}
+
+    utf-32be \u0000 00000000 {} {Lowest code unit}
+    utf-32be \uFFFF 0000FFFF {} {Highest BMP}
+    utf-32be \U010000 00010000 {} {First supplementary}
+    utf-32be \U10FFFF 0010FFFF {} {Last supplementary}
+    utf-32be A\u03A9\u8A9E\U00010384 00000041000003A900008A9E00010384 {} {Unicode 2.5}
+}
+
+# encInvalidBytes - Table of invalid byte sequences
+# These are byte sequences that should appear for an encoding. Each row is
+# of the form
+#    <ENCODING BYTES PROFILE EXPECTEDRESULT EXPECTEDFAILINDEX CTRL COMMENT>
+# The triple <ENCODING,BYTES,PROFILE> should be unique for test ids to be
+# unique. BYTES is a byte sequence that is invalid. EXPECTEDRESULT is the
+# expected string when the bytes are decoded using the PROFILE profile.
+# FAILINDEX gives the expected index of the invalid byte under that profile. The
+# CTRL field is a list that controls test generation. It may contain zero or
+# more of `solo`, `lead`, `tail` and `middle` indicating that the generated the
+# tail of a longer and in the middle of a longer string. If empty, it is treated
+# as containing all four of the above. The CTRL field may also contain the words
+# knownBug or knownW3C which will cause the test generation for that vector to
+# be skipped.
+#
+# utf-32 missing because they are automatically generated based on le/be
+# versions.
+set encInvalidBytes {}; # Reset the table
+
+# ascii - Any byte above 127 is invalid and is mapped
+# to the same numeric code point except for the range
+# 80-9F which is treated as cp1252.
+# This tests the TableToUtfProc code path.
+lappend encInvalidBytes {*}{
+    ascii 80 tcl8    \u20AC -1 {knownBug} {map to cp1252}
+    ascii 80 replace \uFFFD -1 {} {Smallest invalid byte}
+    ascii 80 strict  {}      0 {} {Smallest invalid byte}
+    ascii 81 tcl8    \u0081 -1 {knownBug} {map to cp1252}
+    ascii 82 tcl8    \u201A -1 {knownBug} {map to cp1252}
+    ascii 83 tcl8    \u0192 -1 {knownBug} {map to cp1252}
+    ascii 84 tcl8    \u201E -1 {knownBug} {map to cp1252}
+    ascii 85 tcl8    \u2026 -1 {knownBug} {map to cp1252}
+    ascii 86 tcl8    \u2020 -1 {knownBug} {map to cp1252}
+    ascii 87 tcl8    \u2021 -1 {knownBug} {map to cp1252}
+    ascii 88 tcl8    \u0276 -1 {knownBug} {map to cp1252}
+    ascii 89 tcl8    \u2030 -1 {knownBug} {map to cp1252}
+    ascii 8A tcl8    \u0160 -1 {knownBug} {map to cp1252}
+    ascii 8B tcl8    \u2039 -1 {knownBug} {map to cp1252}
+    ascii 8C tcl8    \u0152 -1 {knownBug} {map to cp1252}
+    ascii 8D tcl8    \u008D -1 {knownBug} {map to cp1252}
+    ascii 8E tcl8    \u017D -1 {knownBug} {map to cp1252}
+    ascii 8F tcl8    \u008F -1 {knownBug} {map to cp1252}
+    ascii 90 tcl8    \u0090 -1 {knownBug} {map to cp1252}
+    ascii 91 tcl8    \u2018 -1 {knownBug} {map to cp1252}
+    ascii 92 tcl8    \u2019 -1 {knownBug} {map to cp1252}
+    ascii 93 tcl8    \u201C -1 {knownBug} {map to cp1252}
+    ascii 94 tcl8    \u201D -1 {knownBug} {map to cp1252}
+    ascii 95 tcl8    \u2022 -1 {knownBug} {map to cp1252}
+    ascii 96 tcl8    \u2013 -1 {knownBug} {map to cp1252}
+    ascii 97 tcl8    \u2014 -1 {knownBug} {map to cp1252}
+    ascii 98 tcl8    \u02DC -1 {knownBug} {map to cp1252}
+    ascii 99 tcl8    \u2122 -1 {knownBug} {map to cp1252}
+    ascii 9A tcl8    \u0161 -1 {knownBug} {map to cp1252}
+    ascii 9B tcl8    \u203A -1 {knownBug} {map to cp1252}
+    ascii 9C tcl8    \u0153 -1 {knownBug} {map to cp1252}
+    ascii 9D tcl8    \u009D -1 {knownBug} {map to cp1252}
+    ascii 9E tcl8    \u017E -1 {knownBug} {map to cp1252}
+    ascii 9F tcl8    \u0178 -1 {knownBug} {map to cp1252}
+
+    ascii FF tcl8    \u00FF -1 {} {Largest invalid byte}
+    ascii FF replace \uFFFD -1 {} {Largest invalid byte}
+    ascii FF strict  {}      0 {} {Largest invalid byte}
+}
+
+# utf-8 - valid sequences based on Table 3.7 in the Unicode
+# standard.
+#
+# Code Points        First   Second  Third   Fourth Byte
+# U+0000..U+007F     00..7F
+# U+0080..U+07FF     C2..DF  80..BF
+# U+0800..U+0FFF     E0      A0..BF  80..BF
+# U+1000..U+CFFF     E1..EC  80..BF  80..BF
+# U+D000..U+D7FF     ED      80..9F  80..BF
+# U+E000..U+FFFF     EE..EF  80..BF  80..BF
+# U+10000..U+3FFFF   F0      90..BF  80..BF  80..BF
+# U+40000..U+FFFFF   F1..F3  80..BF  80..BF  80..BF
+# U+100000..U+10FFFF F4      80..8F  80..BF  80..BF
+#
+# Tests below are based on the "gaps" in the above table. Note ascii test
+# values are repeated because internally a different code path is used
+# (UtfToUtfProc).
+# Note C0, C1, F5:FF are invalid bytes ANYWHERE. Exception is C080
+lappend encInvalidBytes {*}{
+    utf-8 80 tcl8    \u20AC -1 {} {map to cp1252}
+    utf-8 80 replace \uFFFD -1 {} {Smallest invalid byte}
+    utf-8 80 strict  {}      0 {} {Smallest invalid byte}
+    utf-8 81 tcl8    \u0081 -1 {} {map to cp1252}
+    utf-8 82 tcl8    \u201A -1 {} {map to cp1252}
+    utf-8 83 tcl8    \u0192 -1 {} {map to cp1252}
+    utf-8 84 tcl8    \u201E -1 {} {map to cp1252}
+    utf-8 85 tcl8    \u2026 -1 {} {map to cp1252}
+    utf-8 86 tcl8    \u2020 -1 {} {map to cp1252}
+    utf-8 87 tcl8    \u2021 -1 {} {map to cp1252}
+    utf-8 88 tcl8    \u02C6 -1 {} {map to cp1252}
+    utf-8 89 tcl8    \u2030 -1 {} {map to cp1252}
+    utf-8 8A tcl8    \u0160 -1 {} {map to cp1252}
+    utf-8 8B tcl8    \u2039 -1 {} {map to cp1252}
+    utf-8 8C tcl8    \u0152 -1 {} {map to cp1252}
+    utf-8 8D tcl8    \u008D -1 {} {map to cp1252}
+    utf-8 8E tcl8    \u017D -1 {} {map to cp1252}
+    utf-8 8F tcl8    \u008F -1 {} {map to cp1252}
+    utf-8 90 tcl8    \u0090 -1 {} {map to cp1252}
+    utf-8 91 tcl8    \u2018 -1 {} {map to cp1252}
+    utf-8 92 tcl8    \u2019 -1 {} {map to cp1252}
+    utf-8 93 tcl8    \u201C -1 {} {map to cp1252}
+    utf-8 94 tcl8    \u201D -1 {} {map to cp1252}
+    utf-8 95 tcl8    \u2022 -1 {} {map to cp1252}
+    utf-8 96 tcl8    \u2013 -1 {} {map to cp1252}
+    utf-8 97 tcl8    \u2014 -1 {} {map to cp1252}
+    utf-8 98 tcl8    \u02DC -1 {} {map to cp1252}
+    utf-8 99 tcl8    \u2122 -1 {} {map to cp1252}
+    utf-8 9A tcl8    \u0161 -1 {} {map to cp1252}
+    utf-8 9B tcl8    \u203A -1 {} {map to cp1252}
+    utf-8 9C tcl8    \u0153 -1 {} {map to cp1252}
+    utf-8 9D tcl8    \u009D -1 {} {map to cp1252}
+    utf-8 9E tcl8    \u017E -1 {} {map to cp1252}
+    utf-8 9F tcl8    \u0178 -1 {} {map to cp1252}
+
+    utf-8 C0 tcl8    \u00C0 -1 {} {C0 is invalid anywhere}
+    utf-8 C0 strict  {}      0 {} {C0 is invalid anywhere}
+    utf-8 C0 replace \uFFFD -1 {} {C0 is invalid anywhere}
+    utf-8 C080 tcl8    \u0000 -1 {} {C080 -> U+0 in Tcl's internal modified UTF8}
+    utf-8 C080 strict  {}      0 {} {C080 -> invalid}
+    utf-8 C080 replace \uFFFD -1 {} {C080 -> single replacement char}
+    utf-8 C0A2 tcl8    \u00C0\u00A2 -1 {} {websec.github.io - A}
+    utf-8 C0A2 replace \uFFFD\uFFFD -1 {} {websec.github.io - A}
+    utf-8 C0A2 strict  {}            0 {} {websec.github.io - A}
+    utf-8 C0A7 tcl8    \u00C0\u00A7 -1 {} {websec.github.io - double quote}
+    utf-8 C0A7 replace \uFFFD\uFFFD -1 {} {websec.github.io - double quote}
+    utf-8 C0A7 strict  {}            0 {} {websec.github.io - double quote}
+    utf-8 C0AE tcl8    \u00C0\u00AE -1 {} {websec.github.io - full stop}
+    utf-8 C0AE replace \uFFFD\uFFFD -1 {} {websec.github.io - full stop}
+    utf-8 C0AE strict  {}            0 {} {websec.github.io - full stop}
+    utf-8 C0AF tcl8    \u00C0\u00AF -1 {} {websec.github.io - solidus}
+    utf-8 C0AF replace \uFFFD\uFFFD -1 {} {websec.github.io - solidus}
+    utf-8 C0AF strict  {}            0 {} {websec.github.io - solidus}
+
+    utf-8 C1 tcl8    \u00C1 -1 {} {C1 is invalid everywhere}
+    utf-8 C1 replace \uFFFD -1 {} {C1 is invalid everywhere}
+    utf-8 C1 strict  {}      0 {} {C1 is invalid everywhere}
+    utf-8 C181 tcl8    \u00C1\u0081 -1 {} {websec.github.io - base test (A)}
+    utf-8 C181 replace \uFFFD\uFFFD -1 {} {websec.github.io - base test (A)}
+    utf-8 C181 strict  {}            0 {} {websec.github.io - base test (A)}
+    utf-8 C19C tcl8    \u00C1\u0153 -1 {} {websec.github.io - reverse solidus}
+    utf-8 C19C replace \uFFFD\uFFFD -1 {} {websec.github.io - reverse solidus}
+    utf-8 C19C strict  {}            0 {} {websec.github.io - reverse solidus}
+
+    utf-8 C2 tcl8      \u00C2     -1 {} {Missing trail byte}
+    utf-8 C2 replace   \uFFFD     -1 {} {Missing trail byte}
+    utf-8 C2 strict    {}          0 {} {Missing trail byte}
+    utf-8 C27F tcl8    \u00C2\x7F -1 {} {Trail byte must be 80:BF}
+    utf-8 C27F replace \uFFFD\x7F -1 {} {Trail byte must be 80:BF}
+    utf-8 C27F strict  {}          0 {} {Trail byte must be 80:BF}
+    utf-8 DF tcl8      \u00DF     -1 {} {Missing trail byte}
+    utf-8 DF replace   \uFFFD     -1 {} {Missing trail byte}
+    utf-8 DF strict    {}          0 {} {Missing trail byte}
+    utf-8 DF7F tcl8    \u00DF\x7F -1 {} {Trail byte must be 80:BF}
+    utf-8 DF7F replace \uFFFD\x7F -1 {} {Trail byte must be 80:BF}
+    utf-8 DF7F strict  {}          0 {} {Trail byte must be 80:BF}
+    utf-8 DFE0A080 tcl8    \u00DF\u0800 -1 {} {Invalid trail byte is start of valid sequence}
+    utf-8 DFE0A080 replace \uFFFD\u0800 -1 {} {Invalid trail byte is start of valid sequence}
+    utf-8 DFE0A080 strict  {}            0 {} {Invalid trail byte is start of valid sequence}
+
+    utf-8 E0 tcl8      \u00E0     -1 {} {Missing trail byte}
+    utf-8 E0 replace   \uFFFD     -1 {} {Missing trail byte}
+    utf-8 E0 strict    {}          0 {} {Missing trail byte}
+    utf-8 E080 tcl8      \u00E0\u20AC   -1 {} {First trail byte must be A0:BF}
+    utf-8 E080 replace   \uFFFD\uFFFD   -1 {} {First trail byte must be A0:BF}
+    utf-8 E080 strict    {}              0 {} {First trail byte must be A0:BF}
+    utf-8 E0819C tcl8    \u00E0\u0081\u0153 -1 {} {websec.github.io - reverse solidus}
+    utf-8 E0819C replace \uFFFD\uFFFD\uFFFD -1 {} {websec.github.io - reverse solidus}
+    utf-8 E0819C strict  {}                  0 {} {websec.github.io - reverse solidus}
+    utf-8 E09F tcl8      \u00E0\u0178   -1 {} {First trail byte must be A0:BF}
+    utf-8 E09F replace   \uFFFD\uFFFD   -1 {} {First trail byte must be A0:BF}
+    utf-8 E09F strict    {}              0 {} {First trail byte must be A0:BF}
+    utf-8 E0A0 tcl8      \u00E0\u00A0   -1 {} {Missing second trail byte}
+    utf-8 E0A0 replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 E0A0 strict    {}              0 {} {Missing second trail byte}
+    utf-8 E0BF tcl8      \u00E0\u00BF   -1 {} {Missing second trail byte}
+    utf-8 E0BF replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 E0BF strict    {}              0 {} {Missing second trail byte}
+    utf-8 E0A07F tcl8    \u00E0\u00A0\x7F   -1 {}     {Second trail byte must be 80:BF}
+    utf-8 E0A07F replace \uFFFD\u7F         -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 E0A07F strict  {}                  0 {}         {Second trail byte must be 80:BF}
+    utf-8 E0BF7F tcl8    \u00E0\u00BF\x7F   -1 {}         {Second trail byte must be 80:BF}
+    utf-8 E0BF7F replace \uFFFD\u7F         -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 E0BF7F strict  {}                  0 {}         {Second trail byte must be 80:BF}
+
+    utf-8 E1 tcl8      \u00E1     -1 {} {Missing trail byte}
+    utf-8 E1 replace   \uFFFD     -1 {} {Missing trail byte}
+    utf-8 E1 strict    {}          0 {} {Missing trail byte}
+    utf-8 E17F tcl8    \u00E1\x7F -1 {} {Trail byte must be 80:BF}
+    utf-8 E17F replace \uFFFD\x7F -1 {} {Trail byte must be 80:BF}
+    utf-8 E17F strict  {}          0 {} {Trail byte must be 80:BF}
+    utf-8 E181 tcl8      \u00E1\u0081   -1 {} {Missing second trail byte}
+    utf-8 E181 replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 E181 strict    {}              0 {} {Missing second trail byte}
+    utf-8 E1BF tcl8      \u00E1\u00BF   -1 {} {Missing second trail byte}
+    utf-8 E1BF replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 E1BF strict    {}              0 {} {Missing second trail byte}
+    utf-8 E1807F tcl8    \u00E1\u20AC\x7F   -1 {} {Second trail byte must be 80:BF}
+    utf-8 E1807F replace \uFFFD\u7F         -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 E1807F strict  {}                  0 {}         {Second trail byte must be 80:BF}
+    utf-8 E1BF7F tcl8    \u00E1\u00BF\x7F   -1 {}         {Second trail byte must be 80:BF}
+    utf-8 E1BF7F replace \uFFFD\u7F         -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 E1BF7F strict  {}                  0 {}         {Second trail byte must be 80:BF}
+    utf-8 EC tcl8      \u00EC     -1 {} {Missing trail byte}
+    utf-8 EC replace   \uFFFD     -1 {} {Missing trail byte}
+    utf-8 EC strict    {}          0 {} {Missing trail byte}
+    utf-8 EC7F tcl8    \u00EC\x7F -1 {} {Trail byte must be 80:BF}
+    utf-8 EC7F replace \uFFFD\x7F -1 {} {Trail byte must be 80:BF}
+    utf-8 EC7F strict  {}          0 {} {Trail byte must be 80:BF}
+    utf-8 EC81 tcl8      \u00EC\u0081   -1 {} {Missing second trail byte}
+    utf-8 EC81 replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 EC81 strict    {}              0 {} {Missing second trail byte}
+    utf-8 ECBF tcl8      \u00EC\u00BF   -1 {} {Missing second trail byte}
+    utf-8 ECBF replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 ECBF strict    {}              0 {} {Missing second trail byte}
+    utf-8 EC807F tcl8    \u00EC\u20AC\x7F   -1 {} {Second trail byte must be 80:BF}
+    utf-8 EC807F replace \uFFFD\u7F         -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 EC807F strict  {}                  0 {}         {Second trail byte must be 80:BF}
+    utf-8 ECBF7F tcl8    \u00EC\u00BF\x7F   -1 {}         {Second trail byte must be 80:BF}
+    utf-8 ECBF7F replace \uFFFD\u7F         -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 ECBF7F strict  {}                  0 {}         {Second trail byte must be 80:BF}
+
+    utf-8 ED tcl8       \u00ED        -1 {} {Missing trail byte}
+    utf-8 ED replace    \uFFFD        -1 {} {Missing trail byte}
+    utf-8 ED strict     {}             0 {} {Missing trail byte}
+    utf-8 ED7F tcl8     \u00ED\u7F    -1 {} {First trail byte must be 80:9F}
+    utf-8 ED7F replace  \uFFFD\u7F    -1 {} {First trail byte must be 80:9F}
+    utf-8 ED7F strict   {}             0 {} {First trail byte must be 80:9F}
+    utf-8 EDA0 tcl8     \u00ED\u00A0  -1 {} {First trail byte must be 80:9F}
+    utf-8 EDA0 replace  \uFFFD\uFFFD  -1 {} {First trail byte must be 80:9F}
+    utf-8 EDA0 strict   {}             0 {} {First trail byte must be 80:9F}
+    utf-8 ED81 tcl8      \u00ED\u0081   -1 {} {Missing second trail byte}
+    utf-8 ED81 replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 ED81 strict    {}              0 {} {Missing second trail byte}
+    utf-8 EDBF tcl8      \u00ED\u00BF   -1 {} {Missing second trail byte}
+    utf-8 EDBF replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 EDBF strict    {}              0 {} {Missing second trail byte}
+    utf-8 ED807F tcl8      \u00ED\u20AC\x7F -1 {} {Second trail byte must be 80:BF}
+    utf-8 ED807F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 ED807F strict    {}                0 {}  {Second trail byte must be 80:BF}
+    utf-8 ED9F7F tcl8      \u00ED\u0178\x7F -1 {} {Second trail byte must be 80:BF}
+    utf-8 ED9F7F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 ED9F7F strict    {}                0 {}  {Second trail byte must be 80:BF}
+    utf-8 EDA080 tcl8       \uD800          -1 {}  {High surrogate}
+    utf-8 EDA080 replace    \uFFFD          -1 {knownBug}  {High surrogate}
+    utf-8 EDA080 strict     {}               0 {}  {High surrogate}
+    utf-8 EDAFBF tcl8       \uDBFF          -1 {}  {High surrogate}
+    utf-8 EDAFBF replace    \uFFFD          -1 {knownBug}  {High surrogate}
+    utf-8 EDAFBF strict     {}               0 {}  {High surrogate}
+    utf-8 EDB080 tcl8       \uDC00          -1 {}  {Low surrogate}
+    utf-8 EDB080 replace    \uFFFD          -1 {knownBug}  {Low surrogate}
+    utf-8 EDB080 strict     {}               0 {}  {Low surrogate}
+    utf-8 EDBFBF tcl8       \uDFFF          -1 {knownBug}  {Low surrogate}
+    utf-8 EDBFBF replace    \uFFFD          -1 {knownBug}  {Low surrogate}
+    utf-8 EDBFBF strict     {}               0 {}  {Low surrogate}
+    utf-8 EDA080EDB080 tcl8 \U00010000      -1 {knownBug}  {High low surrogate pair}
+    utf-8 EDA080EDB080 replace \uFFFD\uFFFD -1 {knownBug}  {High low surrogate pair}
+    utf-8 EDA080EDB080 strict {}             0 {}  {High low surrogate pair}
+    utf-8 EDAFBFEDBFBF tcl8 \U0010FFFF      -1 {knownBug}  {High low surrogate pair}
+    utf-8 EDAFBFEDBFBF replace \uFFFD\uFFFD -1 {knownBug}  {High low surrogate pair}
+    utf-8 EDAFBFEDBFBF strict {}             0 {}  {High low surrogate pair}
+
+    utf-8 EE tcl8       \u00EE        -1 {} {Missing trail byte}
+    utf-8 EE replace    \uFFFD        -1 {} {Missing trail byte}
+    utf-8 EE strict     {}             0 {} {Missing trail byte}
+    utf-8 EE7F tcl8     \u00EE\u7F    -1 {} {First trail byte must be 80:BF}
+    utf-8 EE7F replace  \uFFFD\u7F    -1 {} {First trail byte must be 80:BF}
+    utf-8 EE7F strict   {}             0 {} {First trail byte must be 80:BF}
+    utf-8 EED0 tcl8     \u00EE\u00D0  -1 {} {First trail byte must be 80:BF}
+    utf-8 EED0 replace  \uFFFD\uFFFD  -1 {} {First trail byte must be 80:BF}
+    utf-8 EED0 strict   {}             0 {} {First trail byte must be 80:BF}
+    utf-8 EE81 tcl8      \u00EE\u0081   -1 {} {Missing second trail byte}
+    utf-8 EE81 replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 EE81 strict    {}              0 {} {Missing second trail byte}
+    utf-8 EEBF tcl8      \u00EE\u00BF   -1 {} {Missing second trail byte}
+    utf-8 EEBF replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 EEBF strict    {}              0 {} {Missing second trail byte}
+    utf-8 EE807F tcl8      \u00EE\u20AC\x7F -1 {} {Second trail byte must be 80:BF}
+    utf-8 EE807F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 EE807F strict    {}                0 {}  {Second trail byte must be 80:BF}
+    utf-8 EEBF7F tcl8      \u00EE\u00BF\x7F -1 {} {Second trail byte must be 80:BF}
+    utf-8 EEBF7F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 EEBF7F strict    {}                0 {}  {Second trail byte must be 80:BF}
+    utf-8 EF tcl8       \u00EF        -1 {} {Missing trail byte}
+    utf-8 EF replace    \uFFFD        -1 {} {Missing trail byte}
+    utf-8 EF strict     {}             0 {} {Missing trail byte}
+    utf-8 EF7F tcl8     \u00EF\u7F    -1 {} {First trail byte must be 80:BF}
+    utf-8 EF7F replace  \uFFFD\u7F    -1 {} {First trail byte must be 80:BF}
+    utf-8 EF7F strict   {}             0 {} {First trail byte must be 80:BF}
+    utf-8 EFD0 tcl8     \u00EF\u00D0  -1 {} {First trail byte must be 80:BF}
+    utf-8 EFD0 replace  \uFFFD\uFFFD  -1 {} {First trail byte must be 80:BF}
+    utf-8 EFD0 strict   {}             0 {} {First trail byte must be 80:BF}
+    utf-8 EF81 tcl8      \u00EF\u0081   -1 {} {Missing second trail byte}
+    utf-8 EF81 replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 EF81 strict    {}              0 {} {Missing second trail byte}
+    utf-8 EFBF tcl8      \u00EF\u00BF   -1 {} {Missing second trail byte}
+    utf-8 EFBF replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 EFBF strict    {}              0 {} {Missing second trail byte}
+    utf-8 EF807F tcl8      \u00EF\u20AC\x7F -1 {} {Second trail byte must be 80:BF}
+    utf-8 EF807F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 EF807F strict    {}                0 {}  {Second trail byte must be 80:BF}
+    utf-8 EFBF7F tcl8      \u00EF\u00BF\x7F -1 {} {Second trail byte must be 80:BF}
+    utf-8 EFBF7F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 EFBF7F strict    {}                0 {}  {Second trail byte must be 80:BF}
+
+    utf-8 F0 tcl8       \u00F0        -1 {} {Missing trail byte}
+    utf-8 F0 replace    \uFFFD        -1 {} {Missing trail byte}
+    utf-8 F0 strict     {}             0 {} {Missing trail byte}
+    utf-8 F080 tcl8     \u00F0\u20AC  -1 {} {First trail byte must be 90:BF}
+    utf-8 F080 replace  \uFFFD        -1 {knownW3C} {First trail byte must be 90:BF}
+    utf-8 F080 strict   {}             0 {} {First trail byte must be 90:BF}
+    utf-8 F08F tcl8     \u00F0\u8F    -1 {} {First trail byte must be 90:BF}
+    utf-8 F08F replace  \uFFFD        -1 {knownW3C} {First trail byte must be 90:BF}
+    utf-8 F08F strict   {}             0 {} {First trail byte must be 90:BF}
+    utf-8 F0D0 tcl8     \u00F0\u00D0  -1 {} {First trail byte must be 90:BF}
+    utf-8 F0D0 replace  \uFFFD\uFFFD  -1 {} {First trail byte must be 90:BF}
+    utf-8 F0D0 strict   {}             0 {} {First trail byte must be 90:BF}
+    utf-8 F090 tcl8      \u00F0\u0090   -1 {} {Missing second trail byte}
+    utf-8 F090 replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 F090 strict    {}              0 {} {Missing second trail byte}
+    utf-8 F0BF tcl8      \u00F0\u00BF   -1 {} {Missing second trail byte}
+    utf-8 F0BF replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 F0BF strict    {}              0 {} {Missing second trail byte}
+    utf-8 F0907F tcl8      \u00F0\u0090\x7F -1 {} {Second trail byte must be 80:BF}
+    utf-8 F0907F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 F0907F strict    {}                0 {}  {Second trail byte must be 80:BF}
+    utf-8 F0BF7F tcl8      \u00F0\u00BF\x7F -1 {} {Second trail byte must be 80:BF}
+    utf-8 F0BF7F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 F0BF7F strict    {}                0 {}  {Second trail byte must be 80:BF}
+    utf-8 F090BF tcl8      \u00F0\u0090\u00BF   -1 {} {Missing third trail byte}
+    utf-8 F090BF replace   \uFFFD         -1 {knownW3C} {Missing third trail byte}
+    utf-8 F090BF strict    {}              0 {} {Missing third trail byte}
+    utf-8 F0BF81 tcl8      \u00F0\u00BF\u0081   -1 {} {Missing third trail byte}
+    utf-8 F0BF81 replace   \uFFFD         -1 {knownW3C} {Missing third trail byte}
+    utf-8 F0BF81 strict    {}              0 {} {Missing third trail byte}
+    utf-8 F0BF807F tcl8      \u00F0\u00BF\u20AC\x7F   -1 {} {Third trail byte must be 80:BF}
+    utf-8 F0BF817F replace   \uFFFD\x7F           -1 {knownW3C} {Third trail byte must be 80:BF}
+    utf-8 F0BF817F strict    {}              0 {} {Third trail byte must be 80:BF}
+    utf-8 F090BFD0 tcl8      \u00F0\u0090\u00BF\u00D0   -1 {} {Third trail byte must be 80:BF}
+    utf-8 F090BFD0 replace   \uFFFD         -1 {knownW3C} {Third trail byte must be 80:BF}
+    utf-8 F090BFD0 strict    {}              0 {} {Third trail byte must be 80:BF}
+
+    utf-8 F1 tcl8       \u00F1        -1 {} {Missing trail byte}
+    utf-8 F1 replace    \uFFFD        -1 {} {Missing trail byte}
+    utf-8 F1 strict     {}             0 {} {Missing trail byte}
+    utf-8 F17F tcl8     \u00F1\u7F    -1 {} {First trail byte must be 80:BF}
+    utf-8 F17F replace  \uFFFD        -1 {knownW3C} {First trail byte must be 80:BF}
+    utf-8 F17F strict   {}             0 {} {First trail byte must be 80:BF}
+    utf-8 F1D0 tcl8     \u00F1\u00D0  -1 {} {First trail byte must be 80:BF}
+    utf-8 F1D0 replace  \uFFFD\uFFFD  -1 {} {First trail byte must be 80:BF}
+    utf-8 F1D0 strict   {}             0 {} {First trail byte must be 80:BF}
+    utf-8 F180 tcl8      \u00F1\u20AC   -1 {} {Missing second trail byte}
+    utf-8 F180 replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 F180 strict    {}              0 {} {Missing second trail byte}
+    utf-8 F1BF tcl8      \u00F1\u00BF   -1 {} {Missing second trail byte}
+    utf-8 F1BF replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 F1BF strict    {}              0 {} {Missing second trail byte}
+    utf-8 F1807F tcl8      \u00F1\u20AC\x7F -1 {} {Second trail byte must be 80:BF}
+    utf-8 F1807F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 F1807F strict    {}                0 {}  {Second trail byte must be 80:BF}
+    utf-8 F1BF7F tcl8      \u00F1\u00BF\x7F -1 {} {Second trail byte must be 80:BF}
+    utf-8 F1BF7F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 F1BF7F strict    {}                0 {}  {Second trail byte must be 80:BF}
+    utf-8 F180BF tcl8      \u00F1\u20AC\u00BF   -1 {} {Missing third trail byte}
+    utf-8 F180BF replace   \uFFFD         -1 {knownW3C} {Missing third trail byte}
+    utf-8 F180BF strict    {}              0 {} {Missing third trail byte}
+    utf-8 F1BF81 tcl8      \u00F1\u00BF\u0081   -1 {} {Missing third trail byte}
+    utf-8 F1BF81 replace   \uFFFD         -1 {knownW3C} {Missing third trail byte}
+    utf-8 F1BF81 strict    {}              0 {} {Missing third trail byte}
+    utf-8 F1BF807F tcl8      \u00F1\u00BF\u20AC\x7F   -1 {} {Third trail byte must be 80:BF}
+    utf-8 F1BF817F replace   \uFFFD\x7F           -1 {knownW3C} {Third trail byte must be 80:BF}
+    utf-8 F1BF817F strict    {}              0 {} {Third trail byte must be 80:BF}
+    utf-8 F180BFD0 tcl8      \u00F1\u20AC\u00BF\u00D0   -1 {} {Third trail byte must be 80:BF}
+    utf-8 F180BFD0 replace   \uFFFD         -1 {knownW3C} {Third trail byte must be 80:BF}
+    utf-8 F180BFD0 strict    {}              0 {} {Third trail byte must be 80:BF}
+    utf-8 F3 tcl8       \u00F3        -1 {} {Missing trail byte}
+    utf-8 F3 replace    \uFFFD        -1 {} {Missing trail byte}
+    utf-8 F3 strict     {}             0 {} {Missing trail byte}
+    utf-8 F37F tcl8     \u00F3\x7F    -1 {} {First trail byte must be 80:BF}
+    utf-8 F37F replace  \uFFFD        -1 {knownW3C} {First trail byte must be 80:BF}
+    utf-8 F37F strict   {}             0 {} {First trail byte must be 80:BF}
+    utf-8 F3D0 tcl8     \u00F3\u00D0  -1 {} {First trail byte must be 80:BF}
+    utf-8 F3D0 replace  \uFFFD\uFFFD  -1 {} {First trail byte must be 80:BF}
+    utf-8 F3D0 strict   {}             0 {} {First trail byte must be 80:BF}
+    utf-8 F380 tcl8      \u00F3\u20AC   -1 {} {Missing second trail byte}
+    utf-8 F380 replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 F380 strict    {}              0 {} {Missing second trail byte}
+    utf-8 F3BF tcl8      \u00F3\u00BF   -1 {} {Missing second trail byte}
+    utf-8 F3BF replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 F3BF strict    {}              0 {} {Missing second trail byte}
+    utf-8 F3807F tcl8      \u00F3\u20AC\x7F -1 {} {Second trail byte must be 80:BF}
+    utf-8 F3807F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 F3807F strict    {}                0 {}  {Second trail byte must be 80:BF}
+    utf-8 F3BF7F tcl8      \u00F3\u00BF\x7F -1 {} {Second trail byte must be 80:BF}
+    utf-8 F3BF7F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 F3BF7F strict    {}                0 {}  {Second trail byte must be 80:BF}
+    utf-8 F380BF tcl8      \u00F3\u20AC\u00BF   -1 {} {Missing third trail byte}
+    utf-8 F380BF replace   \uFFFD         -1 {knownW3C} {Missing third trail byte}
+    utf-8 F380BF strict    {}              0 {} {Missing third trail byte}
+    utf-8 F3BF81 tcl8      \u00F3\u00BF\u0081   -1 {} {Missing third trail byte}
+    utf-8 F3BF81 replace   \uFFFD         -1 {knownW3C} {Missing third trail byte}
+    utf-8 F3BF81 strict    {}              0 {} {Missing third trail byte}
+    utf-8 F3BF807F tcl8      \u00F3\u00BF\u20AC\x7F   -1 {} {Third trail byte must be 80:BF}
+    utf-8 F3BF817F replace   \uFFFD\x7F           -1 {knownW3C} {Third trail byte must be 80:BF}
+    utf-8 F3BF817F strict    {}              0 {} {Third trail byte must be 80:BF}
+    utf-8 F380BFD0 tcl8      \u00F3\u20AC\u00BF\u00D0   -1 {} {Third trail byte must be 80:BF}
+    utf-8 F380BFD0 replace   \uFFFD         -1 {knownW3C} {Third trail byte must be 80:BF}
+    utf-8 F380BFD0 strict    {}              0 {} {Third trail byte must be 80:BF}
+
+    utf-8 F4 tcl8       \u00F4        -1 {} {Missing trail byte}
+    utf-8 F4 replace    \uFFFD        -1 {} {Missing trail byte}
+    utf-8 F4 strict     {}             0 {} {Missing trail byte}
+    utf-8 F47F tcl8     \u00F4\u7F    -1 {} {First trail byte must be 80:8F}
+    utf-8 F47F replace  \uFFFD\u7F    -1 {knownW3C} {First trail byte must be 80:8F}
+    utf-8 F47F strict   {}             0 {} {First trail byte must be 80:8F}
+    utf-8 F490 tcl8     \u00F4\u0090  -1 {} {First trail byte must be 80:8F}
+    utf-8 F490 replace  \uFFFD\uFFFD  -1 {} {First trail byte must be 80:8F}
+    utf-8 F490 strict   {}             0 {} {First trail byte must be 80:8F}
+    utf-8 F480 tcl8      \u00F4\u20AC   -1 {} {Missing second trail byte}
+    utf-8 F480 replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 F480 strict    {}              0 {} {Missing second trail byte}
+    utf-8 F48F tcl8      \u00F4\u008F   -1 {} {Missing second trail byte}
+    utf-8 F48F replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 F48F strict    {}              0 {} {Missing second trail byte}
+    utf-8 F4807F tcl8      \u00F4\u20AC\x7F -1 {} {Second trail byte must be 80:BF}
+    utf-8 F4807F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 F4807F strict    {}                0 {}  {Second trail byte must be 80:BF}
+    utf-8 F48F7F tcl8      \u00F4\u008F\x7F -1 {} {Second trail byte must be 80:BF}
+    utf-8 F48F7F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 F48F7F strict    {}                0 {}  {Second trail byte must be 80:BF}
+    utf-8 F48081 tcl8      \u00F4\u20AC\u0081   -1 {} {Missing third trail byte}
+    utf-8 F48081 replace   \uFFFD         -1 {knownW3C} {Missing third trail byte}
+    utf-8 F48081 strict    {}              0 {} {Missing third trail byte}
+    utf-8 F48F81 tcl8      \u00F4\u008F\u0081   -1 {} {Missing third trail byte}
+    utf-8 F48F81 replace   \uFFFD         -1 {knownW3C} {Missing third trail byte}
+    utf-8 F48F81 strict    {}              0 {} {Missing third trail byte}
+    utf-8 F481817F tcl8      \u00F4\u0081\u0081\x7F   -1 {} {Third trail byte must be 80:BF}
+    utf-8 F480817F replace   \uFFFD\x7F           -1 {knownW3C} {Third trail byte must be 80:BF}
+    utf-8 F480817F strict    {}              0 {} {Third trail byte must be 80:BF}
+    utf-8 F48FBFD0 tcl8      \u00F4\u008F\u00BF\u00D0   -1 {} {Third trail byte must be 80:BF}
+    utf-8 F48FBFD0 replace   \uFFFD         -1 {knownW3C} {Third trail byte must be 80:BF}
+    utf-8 F48FBFD0 strict    {}              0 {} {Third trail byte must be 80:BF}
+
+    utf-8 F5 tcl8    \u00F5 -1 {} {F5:FF are invalid everywhere}
+    utf-8 F5 replace \uFFFD -1 {} {F5:FF are invalid everywhere}
+    utf-8 F5 strict  {}      0 {} {F5:FF are invalid everywhere}
+    utf-8 FF tcl8    \u00FF -1 {} {F5:FF are invalid everywhere}
+    utf-8 FF replace \uFFFD -1 {} {F5:FF are invalid everywhere}
+    utf-8 FF strict  {}      0 {} {F5:FF are invalid everywhere}
+
+    utf-8 C0AFE080BFF0818130 replace \uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\x30 -1 {} {Unicode Table 3-8}
+    utf-8 EDA080EDBFBFEDAF30 replace \uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\x30 -1 {knownW3C} {Unicode Table 3-9}
+    utf-8 F4919293FF4180BF30 replace \uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u0041\uFFFD\uFFFD\x30 -1 {} {Unicode Table 3-10}
+    utf-8 E180E2F09192F1BF30 replace \uFFFD\uFFFD\uFFFD\uFFFD\x30                         -1 {knownW3C} {Unicode Table 3.11}
+}
+
+# utf16-le and utf16-be test cases. Note utf16 cases are automatically generated
+# based on these depending on platform endianness. Note truncated tests can only
+# happen when the sequence is at the end (including by itself) Thus {solo tail}
+# in some cases.
+lappend encInvalidBytes {*}{
+    utf-16le 41      tcl8      \uFFFD -1 {solo tail} {Truncated}
+    utf-16le 41      replace   \uFFFD -1 {solo tail} {Truncated}
+    utf-16le 41      strict    {}      0 {solo tail} {Truncated}
+    utf-16le 00D8    tcl8      \uD800 -1 {} {Missing low surrogate}
+    utf-16le 00D8    replace   \uFFFD -1 {} {Missing low surrogate}
+    utf-16le 00D8    strict    {}      0 {knownBug} {Missing low surrogate}
+    utf-16le 00DC    tcl8      \uDC00 -1 {} {Missing high surrogate}
+    utf-16le 00DC    replace   \uFFFD -1 {} {Missing high surrogate}
+    utf-16le 00DC    strict    {}      0 {knownBug} {Missing high surrogate}
+
+    utf-16be 41      tcl8      \uFFFD -1 {solo tail} {Truncated}
+    utf-16be 41      replace   \uFFFD -1 {solo tail} {Truncated}
+    utf-16be 41      strict    {}      0 {solo tail} {Truncated}
+    utf-16be D800    tcl8      \uD800 -1 {} {Missing low surrogate}
+    utf-16be D800    replace   \uFFFD -1 {knownBug} {Missing low surrogate}
+    utf-16be D800    strict    {}      0 {knownBug} {Missing low surrogate}
+    utf-16be DC00    tcl8      \uDC00 -1 {} {Missing high surrogate}
+    utf-16be DC00    replace   \uFFFD -1 {knownBug} {Missing high surrogate}
+    utf-16be DC00    strict    {}      0 {knownBug} {Missing high surrogate}
+}
+
+# utf32-le and utf32-be test cases. Note utf32 cases are automatically generated
+# based on these depending on platform endianness. Note truncated tests can only
+# happen when the sequence is at the end (including by itself) Thus {solo tail}
+# in some cases.
+lappend encInvalidBytes {*}{
+    utf-32le 41      tcl8      \uFFFD  -1 {solo tail} {Truncated}
+    utf-32le 41      replace   \uFFFD  -1 {solo} {Truncated}
+    utf-32le 41      strict    {}   0 {solo tail} {Truncated}
+    utf-32le 4100    tcl8      \uFFFD  -1 {solo tail} {Truncated}
+    utf-32le 4100    replace   \uFFFD  -1 {solo} {Truncated}
+    utf-32le 4100    strict    {}   0 {solo tail} {Truncated}
+    utf-32le 410000  tcl8      \uFFFD  -1 {solo tail} {Truncated}
+    utf-32le 410000  replace   \uFFFD  -1 {solo} {Truncated}
+    utf-32le 410000  strict    {}       0 {solo tail} {Truncated}
+    utf-32le 00D80000 tcl8     \uD800   -1 {} {High-surrogate}
+    utf-32le 00D80000 replace  \uFFFD   -1 {} {High-surrogate}
+    utf-32le 00D80000 strict   {}        0 {} {High-surrogate}
+    utf-32le 00DC0000 tcl8     \uDC00   -1 {} {Low-surrogate}
+    utf-32le 00DC0000 replace  \uFFFD   -1 {} {Low-surrogate}
+    utf-32le 00DC0000 strict   {}        0 {} {Low-surrogate}
+    utf-32le 00D8000000DC0000 tcl8 \uD800\uDC00    -1 {} {High-low-surrogate-pair}
+    utf-32le 00D8000000DC0000 replace \uFFFD\uFFFD -1 {} {High-low-surrogate-pair}
+    utf-32le 00D8000000DC0000 strict  {}            0 {} {High-low-surrogate-pair}
+    utf-32le 00001100 tcl8 \UFFFD    -1 {} {Out of range}
+    utf-32le 00001100 replace \UFFFD -1 {} {Out of range}
+    utf-32le 00001100 strict {}       0 {} {Out of range}
+    utf-32le FFFFFFFF tcl8 \UFFFD    -1 {} {Out of range}
+    utf-32le FFFFFFFF replace \UFFFD -1 {} {Out of range}
+    utf-32le FFFFFFFF strict {}       0 {} {Out of range}
+
+    utf-32be 41      tcl8      \uFFFD  -1 {solo tail} {Truncated}
+    utf-32be 41      replace   \uFFFD  -1 {solo tail} {Truncated}
+    utf-32be 41      strict    {}       0 {solo tail} {Truncated}
+    utf-32be 0041    tcl8      \uFFFD  -1 {solo tail} {Truncated}
+    utf-32be 0041    replace   \uFFFD  -1 {solo} {Truncated}
+    utf-32be 0041    strict    {}   0 {solo tail} {Truncated}
+    utf-32be 000041  tcl8      \uFFFD  -1 {solo tail} {Truncated}
+    utf-32be 000041  replace   \uFFFD  -1 {solo} {Truncated}
+    utf-32be 000041  strict    {}       0 {solo tail} {Truncated}
+    utf-32be 0000D800 tcl8     \uD800   -1 {} {High-surrogate}
+    utf-32be 0000D800 replace  \uFFFD   -1 {} {High-surrogate}
+    utf-32be 0000D800 strict   {}        0 {} {High-surrogate}
+    utf-32be 0000DC00 tcl8     \uDC00   -1 {} {Low-surrogate}
+    utf-32be 0000DC00 replace  \uFFFD   -1 {} {Low-surrogate}
+    utf-32be 0000DC00 strict   {}        0 {} {Low-surrogate}
+    utf-32be 0000D8000000DC00 tcl8 \uD800\uDC00    -1 {} {High-low-surrogate-pair}
+    utf-32be 0000D8000000DC00 replace \uFFFD\uFFFD -1 {} {High-low-surrogate-pair}
+    utf-32be 0000D8000000DC00 strict  {}            0 {} {High-low-surrogate-pair}
+    utf-32be 00110000 tcl8 \UFFFD    -1 {} {Out of range}
+    utf-32be 00110000 replace \UFFFD -1 {} {Out of range}
+    utf-32be 00110000 strict {}       0 {} {Out of range}
+    utf-32be FFFFFFFF tcl8 \UFFFD    -1 {} {Out of range}
+    utf-32be FFFFFFFF replace \UFFFD -1 {} {Out of range}
+    utf-32be FFFFFFFF strict {}       0 {} {Out of range}
+}
+
+# Strings that cannot be encoded for specific encoding / profiles
+# <ENCODING STRING PROFILE EXPECTEDRESULT EXPECTEDFAILINDEX CTRL COMMENT>
+# <ENCODING,STRING,PROFILE> should be unique for test ids to be unique.
+# See earlier comments about CTRL field.
+#
+# Note utf-16, utf-32 missing because they are automatically
+# generated based on le/be versions.
+# TODO - out of range code point (note cannot be generated by \U notation)
+lappend encUnencodableStrings {*}{
+    ascii \u00e0 tcl8    3f -1 {} {unencodable}
+    ascii \u00e0 strict  {}  0 {} {unencodable}
+
+    iso8859-1 \u0141 tcl8    3f -1 {} unencodable
+    iso8859-1 \u0141 strict  {}  0 {} unencodable
+
+    utf-8 \uD800 tcl8    eda080 -1 {} High-surrogate
+    utf-8 \uD800 strict  {}      0 {} High-surrogate
+    utf-8 \uDC00 tcl8    edb080 -1 {} High-surrogate
+    utf-8 \uDC00 strict  {}      0 {} High-surrogate
+}
+
+
+# The icuUcmTests.tcl is generated by the tools/ucm2tests.tcl script
+# and generates test vectors for the above tables for various encodings
+# based on ICU UCM files.
+# TODO - commented out for now as generating a lot of mismatches.
+# source [file join [file dirname [info script]] icuUcmTests.tcl]
diff --git a/tests/exec.test b/tests/exec.test
index 3e25360..eece5dc 100644
--- a/tests/exec.test
+++ b/tests/exec.test
@@ -437,7 +437,7 @@ close $f
 test exec-10.20.1 {errors in exec invocation} -constraints {unix exec notValgrind} -body {
     exec ~non_existent_user/foo/bar
 } -returnCodes error -result {couldn't execute "~non_existent_user/foo/bar": no such file or directory}
-test exec-10.20.1 {errors in exec invocation} -constraints {win exec notValgrind} -body {
+test exec-10.20.2 {errors in exec invocation} -constraints {win exec notValgrind} -body {
     exec ~non_existent_user/foo/bar
 } -returnCodes error -result {couldn't execute "~non_existent_user\foo\bar": no such file or directory}
 test exec-10.21.1 {errors in exec invocation} -constraints {unix exec notValgrind} -body {
diff --git a/tests/execute.test b/tests/execute.test
index 6d8ce99..90af21c 100644
--- a/tests/execute.test
+++ b/tests/execute.test
@@ -34,7 +34,6 @@ testConstraint testobj [expr {
     && [llength [info commands teststringobj]]
 }]
 
-testConstraint longIs32bit [expr {$tcl_platform(wordSize) == 4}]
 testConstraint testexprlongobj [llength [info commands testexprlongobj]]
 
 
diff --git a/tests/expr-old.test b/tests/expr-old.test
index 7344e08..7274851 100644
--- a/tests/expr-old.test
+++ b/tests/expr-old.test
@@ -25,7 +25,6 @@ testConstraint testexprlong   [llength [info commands testexprlong]]
 testConstraint testexprdouble [llength [info commands testexprdouble]]
 testConstraint testexprstring [llength [info commands testexprstring]]
 testConstraint longIs32bit [expr {$tcl_platform(wordSize) == 4}]
-testConstraint longIs64bit [expr {$tcl_platform(wordSize) == 8}]
 
 # Big test for correct ordering of data in [expr]
 
diff --git a/tests/expr.test b/tests/expr.test
index a20aee1..15eff76 100644
--- a/tests/expr.test
+++ b/tests/expr.test
@@ -21,7 +21,6 @@ if {"::tcltest" ni [namespace children]} {
 # type is a 64 bit number on this machine.
 
 testConstraint longIs32bit [expr {$tcl_platform(wordSize) == 4}]
-testConstraint longIs64bit [expr {$tcl_platform(wordSize) == 8}]
 testConstraint wideIs64bit [expr {wide(0x8000000000000000) < 0}]
 
 # Big test for correct ordering of data in [expr]
diff --git a/tests/fCmd.test b/tests/fCmd.test
index 0752be6..02833b2 100644
--- a/tests/fCmd.test
+++ b/tests/fCmd.test
@@ -136,7 +136,7 @@ proc gethomedirglob {user} {
             set sid [string trim $sid]
             # Get path from the Windows registry
             set home [registry get "HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList\\$sid" ProfileImagePath]
-            set home [string trim $home]
+            set home [string trim [string tolower $home]]
         } result]} {
             if {$home ne ""} {
                 # file join for \ -> /
@@ -147,7 +147,7 @@ proc gethomedirglob {user} {
 
     # Caller will need to use glob matching and hope user
     # name is in the home directory path
-    return *$user*
+    return *[string tolower $user]*
 }
 
 proc createfile {file {string a}} {
@@ -410,7 +410,7 @@ test fCmd-3.15 {FileCopyRename: source[0] == '\x00'} -setup {
 } -constraints {notRoot unixOrWin} -returnCodes error -body {
     file mkdir td1
     file rename / td1
-} -result {error renaming "/" to "td1": file already exists}
+} -result {error renaming "/" to "td1": file exists}
 test fCmd-3.16 {FileCopyRename: break on first error} -setup {
     cleanup
 } -constraints {notRoot} -returnCodes error -body {
@@ -421,7 +421,7 @@ test fCmd-3.16 {FileCopyRename: break on first error} -setup {
     file mkdir td1
     createfile [file join td1 tf3]
     file rename tf1 tf2 tf3 tf4 td1
-} -result [subst {error renaming "tf3" to "[file join td1 tf3]": file already exists}]
+} -result [subst {error renaming "tf3" to "[file join td1 tf3]": file exists}]
 
 test fCmd-4.1 {TclFileMakeDirsCmd: make each dir: 1 dir} -setup {
     cleanup
@@ -483,7 +483,7 @@ test fCmd-4.9 {TclFileMakeDirsCmd: exists, not dir} -setup {
 } -constraints {notRoot} -returnCodes error -body {
     createfile tf1
     file mkdir tf1
-} -result [subst {can't create directory "[file join tf1]": file already exists}]
+} -result [subst {can't create directory "[file join tf1]": file exists}]
 test fCmd-4.10 {TclFileMakeDirsCmd: exists, is dir} -setup {
     cleanup
 } -constraints {notRoot} -body {
@@ -524,7 +524,7 @@ test fCmd-4.16 {TclFileMakeDirsCmd: TclpCreateDirectory succeeds} -setup {
 } -constraints {notRoot} -body {
     file mkdir tf1
     file exists tf1
-} -result {1}
+} -result 1
 
 test fCmd-5.1 {TclFileDeleteCmd: FileForceOption fails} -constraints {notRoot} -body {
     file delete -xyz
@@ -659,14 +659,14 @@ test fCmd-6.10 {CopyRenameOneFile: lstat(target) == 0} -setup {
     createfile tf1
     createfile tf2
     file rename tf1 tf2
-} -result {error renaming "tf1" to "tf2": file already exists}
+} -result {error renaming "tf1" to "tf2": file exists}
 test fCmd-6.11 {CopyRenameOneFile: force == 0} -setup {
     cleanup
 } -constraints {notRoot} -returnCodes error -body {
     createfile tf1
     createfile tf2
     file rename tf1 tf2
-} -result {error renaming "tf1" to "tf2": file already exists}
+} -result {error renaming "tf1" to "tf2": file exists}
 test fCmd-6.12 {CopyRenameOneFile: force != 0} -setup {
     cleanup
 } -constraints {notRoot} -body {
@@ -806,7 +806,7 @@ test fCmd-6.27 {CopyRenameOneFile: TclpCopyDirectory failed} -setup {
     file mkdir [file join $tmpspace td1]
     createfile [file join $tmpspace td1 tf1]
     file rename -force td1 $tmpspace
-} -match glob -result {error renaming "td1" to "/tmp/tcl*/td1": file already exists}
+} -match glob -result {error renaming "td1" to "/tmp/tcl*/td1": file exists}
 test fCmd-6.28 {CopyRenameOneFile: TclpCopyDirectory failed} -setup {
     cleanup $tmpspace
 } -constraints {notRoot xdev notWsl} -body {
@@ -979,7 +979,7 @@ test fCmd-9.7 {file rename: comprehensive: file to existing file} -setup {
     file rename -force tfs3 tfd3
     file rename -force tfs4 tfd4
     list [lsort [glob tf*]] $msg [file writable tfd1] [file writable tfd2] [file writable tfd3] [file writable tfd4]
-} -result {{tf1 tf2 tfd1 tfd2 tfd3 tfd4} {1 {error renaming "tf1" to "tf2": file already exists}} 1 1 0 0}
+} -result {{tf1 tf2 tfd1 tfd2 tfd3 tfd4} {1 {error renaming "tf1" to "tf2": file exists}} 1 1 0 0}
 test fCmd-9.8 {file rename: comprehensive: dir to empty dir} -setup {
     cleanup
 } -constraints {notRoot testchmod notNetworkFilesystem} -body {
@@ -1015,7 +1015,7 @@ test fCmd-9.8 {file rename: comprehensive: dir to empty dir} -setup {
     }
     list [lsort [glob td*]] $msg [file writable [file join tdd1 tds1]] \
     [file writable [file join tdd2 tds2]] $w3 $w4
-} -result [subst {{td1 td2 tdd1 tdd2 tdd3 tdd4} {1 {error renaming "td1" to "[file join td2 td1]": file already exists}} 1 1 0 0}]
+} -result [subst {{td1 td2 tdd1 tdd2 tdd3 tdd4} {1 {error renaming "td1" to "[file join td2 td1]": file exists}} 1 1 0 0}]
 # Test can hit EEXIST or EBUSY, depending on underlying filesystem
 test fCmd-9.9 {file rename: comprehensive: dir to non-empty dir} -setup {
     cleanup
@@ -1065,7 +1065,7 @@ test fCmd-9.12 {file rename: comprehensive: target exists} -setup {
 	[catch {file rename td1 td2} msg] $msg
 } -cleanup {
     testchmod 0o755 [file join td2 td1]
-} -result [subst {0 1 1 {error renaming "td1" to "[file join td2 td1]": file already exists}}]
+} -result [subst {0 1 1 {error renaming "td1" to "[file join td2 td1]": file exists}}]
 # Test can hit EEXIST or EBUSY, depending on underlying filesystem
 test fCmd-9.13 {file rename: comprehensive: can't overwrite target} -setup {
     cleanup
@@ -1161,6 +1161,7 @@ test fCmd-10.3.1 {file copy: comprehensive: dir to new name} -setup {
     file mkdir [file join td1 tdx]
     file mkdir [file join td2 tdy]
     testchmod 0o555 td2
+    testchmod 0o555 td2/tdy; # Above line removes inherited perms. So restore.
     file copy td1 td3
     file copy td2 td4
     list [lsort [glob td*]] [glob -directory td3 t*] \
@@ -1182,17 +1183,26 @@ test fCmd-10.4 {file copy: comprehensive: file to existing file} -setup {
     createfile tfd2
     createfile tfd3
     createfile tfd4
-    testchmod 0o444 tfs3
-    testchmod 0o444 tfs4
-    testchmod 0o444 tfd2
-    testchmod 0o444 tfd4
+    if {$::tcl_platform(platform) eq "windows"} {
+        # On Windows testchmode will attach an ACL which file copy cannot handle
+        # so use good old attributes which file copy does understand
+        file attribute tfs3 -readonly 1
+        file attribute tfs4 -readonly 1
+        file attribute tfd2 -readonly 1
+        file attribute tfd4 -readonly 1
+    } else {
+        testchmod 0o444 tfs3
+        testchmod 0o444 tfs4
+        testchmod 0o444 tfd2
+        testchmod 0o444 tfd4
+    }
     set msg [list [catch {file copy tf1 tf2} msg] $msg]
     file copy -force tfs1 tfd1
     file copy -force tfs2 tfd2
     file copy -force tfs3 tfd3
     file copy -force tfs4 tfd4
     list [lsort [glob tf*]] $msg [file writable tfd1] [file writable tfd2] [file writable tfd3] [file writable tfd4]
-} -result {{tf1 tf2 tfd1 tfd2 tfd3 tfd4 tfs1 tfs2 tfs3 tfs4} {1 {error copying "tf1" to "tf2": file already exists}} 1 1 0 0}
+} -result {{tf1 tf2 tfd1 tfd2 tfd3 tfd4 tfs1 tfs2 tfs3 tfs4} {1 {error copying "tf1" to "tf2": file exists}} 1 1 0 0}
 test fCmd-10.5 {file copy: comprehensive: dir to empty dir} -setup {
     cleanup
 } -constraints {notRoot testchmod} -body {
@@ -1216,7 +1226,7 @@ test fCmd-10.5 {file copy: comprehensive: dir to empty dir} -setup {
     set a4 [catch {file copy -force tds3 tdd3}]
     set a5 [catch {file copy -force tds4 tdd4}]
     list [lsort [glob td*]] $a1 $a2 $a3 $a4 $a5
-} -result [subst {{td1 td2 tdd1 tdd2 tdd3 tdd4 tds1 tds2 tds3 tds4} {1 {error copying "td1" to "[file join td2 td1]": file already exists}} {1 {error copying "tds1" to "[file join tdd1 tds1]": file already exists}} 1 1 1}]
+} -result [subst {{td1 td2 tdd1 tdd2 tdd3 tdd4 tds1 tds2 tds3 tds4} {1 {error copying "td1" to "[file join td2 td1]": file exists}} {1 {error copying "tds1" to "[file join tdd1 tds1]": file exists}} 1 1 1}]
 test fCmd-10.6 {file copy: comprehensive: dir to non-empty dir} -setup {
     cleanup
 } -constraints {notRoot unixOrWin testchmod notWsl} -body {
@@ -1228,7 +1238,7 @@ test fCmd-10.6 {file copy: comprehensive: dir to non-empty dir} -setup {
     set a1 [list [catch {file copy -force tds1 tdd1} msg] $msg]
     set a2 [list [catch {file copy -force tds2 tdd2} msg] $msg]
     list [lsort [glob td*]] $a1 $a2 [file writable tds1] [file writable tds2]
-} -result [subst {{tdd1 tdd2 tds1 tds2} {1 {error copying "tds1" to "[file join tdd1 tds1]": file already exists}} {1 {error copying "tds2" to "[file join tdd2 tds2]": file already exists}} 1 0}]
+} -result [subst {{tdd1 tdd2 tds1 tds2} {1 {error copying "tds1" to "[file join tdd1 tds1]": file exists}} {1 {error copying "tds2" to "[file join tdd2 tds2]": file exists}} 1 0}]
 test fCmd-10.7 {file rename: comprehensive: file to new name and dir} -setup {
     cleanup
 } -constraints {notRoot testchmod} -body {
@@ -1335,7 +1345,7 @@ test fCmd-11.5 {TclFileRenameCmd: > 1 source & target is not a dir} -setup {
     catch {file rename tfa1 tfa2 tfa3}
 } -cleanup {
     file delete tfa1 tfa2 tfa3
-} -result {1}
+} -result 1
 test fCmd-11.6 {TclFileRenameCmd: : single file into directory} -setup {
     catch {file delete -force -- tfa1 tfad}
 } -constraints {notRoot} -body {
@@ -1380,7 +1390,7 @@ test fCmd-12.1 {renamefile: source filename translation failing} -setup {
     catch {file rename ~/tfa1 tfa2}
 } -cleanup {
     set ::env(HOME) $temp
-} -result {1}
+} -result 1
 test fCmd-12.2 {renamefile: src filename translation failing} -setup {
     set temp $::env(HOME)
 } -constraints {notRoot} -body {
@@ -1392,7 +1402,7 @@ test fCmd-12.2 {renamefile: src filename translation failing} -setup {
 } -cleanup {
     set ::env(HOME) $temp
     file delete -force tfad
-} -result {1}
+} -result 1
 test fCmd-12.3 {renamefile: stat failing on source} -setup {
     catch {file delete -force -- tfa1 tfa2}
 } -constraints {notRoot} -body {
@@ -1437,7 +1447,7 @@ test fCmd-12.7 {renamefile: renaming directory into offspring} -setup {
     catch {file rename tfad tfad/dir}
 } -cleanup {
     file delete -force tfad
-} -result {1}
+} -result 1
 test fCmd-12.8 {renamefile: generic error} -setup {
     catch {file delete -force -- tfa}
 } -constraints {unix notRoot notWsl} -body {
@@ -1448,7 +1458,7 @@ test fCmd-12.8 {renamefile: generic error} -setup {
 } -cleanup {
     catch {file attributes tfa -permissions 0o777}
     file delete -force tfa
-} -result {1}
+} -result 1
 test fCmd-12.9 {renamefile: moving a file across volumes} -setup {
     cleanup $tmpspace
 } -constraints {unix notRoot} -body {
@@ -1510,7 +1520,7 @@ test fCmd-13.5 {TclCopyFilesCmd: target filename translation failing} -setup {
     catch { file copy tfa ~/foobar }
 } -cleanup {
     set ::env(HOME) $temp
-} -result {1}
+} -result 1
 test fCmd-13.6 {TclCopyFilesCmd: > 1 source & target is not a dir} -setup {
     catch {file delete -force -- tfa1 tfa2 tfa3}
 } -constraints {notRoot} -body {
@@ -1520,7 +1530,7 @@ test fCmd-13.6 {TclCopyFilesCmd: > 1 source & target is not a dir} -setup {
     catch {file copy tfa1 tfa2 tfa3}
 } -cleanup {
     file delete tfa1 tfa2 tfa3
-} -result {1}
+} -result 1
 test fCmd-13.7 {TclCopyFilesCmd: single file into directory} -setup {
     catch {file delete -force -- tfa1 tfad}
 } -constraints {notRoot} -body {
@@ -1566,7 +1576,7 @@ test fCmd-14.1 {copyfile: source filename translation failing} -setup {
     catch {file copy ~/tfa1 tfa2}
 } -cleanup {
     set ::env(HOME) $temp
-} -result {1}
+} -result 1
 test fCmd-14.2 {copyfile: dst filename translation failing} -setup {
     set temp $::env(HOME)
 } -constraints {notRoot} -body {
@@ -1634,7 +1644,7 @@ test fCmd-14.8 {copyfile: copy directory failing} -setup {
 } -cleanup {
     file attributes tfa/dir -permissions 0o777
     file delete -force tfa tfa2
-} -result {1}
+} -result 1
 
 #
 # Coverage tests for TclMkdirCmd()
@@ -1660,7 +1670,7 @@ test fCmd-15.2 {TclMakeDirsCmd - one directory} -setup {
     file isdirectory tfa
 } -cleanup {
     file delete tfa
-} -result {1}
+} -result 1
 test fCmd-15.3 {TclMakeDirsCmd: - two directories} -setup {
     catch {file delete -force -- tfa1 tfa2}
 } -constraints {notRoot} -body {
@@ -1679,7 +1689,7 @@ test fCmd-15.4 {TclMakeDirsCmd - stat failing} -setup {
 } -cleanup {
     file attributes tfa -permissions 0o777
     file delete -force tfa
-} -result {1}
+} -result 1
 test fCmd-15.5 {TclMakeDirsCmd: - making a directory several levels deep} -setup {
     catch {file delete -force -- tfa}
 } -constraints {notRoot} -body {
@@ -1687,7 +1697,7 @@ test fCmd-15.5 {TclMakeDirsCmd: - making a directory several levels deep} -setup
     file isdir tfa/a/b/c
 } -cleanup {
     file delete -force tfa
-} -result {1}
+} -result 1
 test fCmd-15.6 {TclMakeDirsCmd: - trying to overwrite a file} -setup {
     catch {file delete -force -- tfa}
 } -constraints {notRoot} -body {
@@ -1711,7 +1721,7 @@ test fCmd-15.8 {TclFileMakeDirsCmd: trying to create an existing dir} -body {
     file isdir tfa
 } -constraints {notRoot} -cleanup {
     file delete tfa
-} -result {1}
+} -result 1
 
 # Coverage tests for TclDeleteFilesCommand()
 test fCmd-16.1 {test the -- argument} -constraints {notRoot} -setup {
@@ -1735,7 +1745,7 @@ test fCmd-16.3 {test bad option} -constraints {notRoot} -setup {
     catch {file delete -dog tfa}
 } -cleanup {
     file delete tfa
-} -result {1}
+} -result 1
 test fCmd-16.4 {accept zero files (TIP 323)} -body {
     file delete
 } -result {}
@@ -1751,7 +1761,7 @@ test fCmd-16.6 {delete: source filename translation failing} -setup {
     catch {file delete ~/tfa}
 } -cleanup {
     set ::env(HOME) $temp
-} -result {1}
+} -result 1
 test fCmd-16.7 {remove a non-empty directory without -force} -setup {
     catch {file delete -force -- tfa}
 } -constraints {notRoot} -body {
@@ -1760,7 +1770,7 @@ test fCmd-16.7 {remove a non-empty directory without -force} -setup {
     catch {file delete tfa}
 } -cleanup {
     file delete -force tfa
-} -result {1}
+} -result 1
 test fCmd-16.8 {remove a normal file} -constraints {notRoot} -setup {
     catch {file delete -force -- tfa}
 } -body {
@@ -1769,7 +1779,7 @@ test fCmd-16.8 {remove a normal file} -constraints {notRoot} -setup {
     catch {file delete tfa}
 } -cleanup {
     file delete -force tfa
-} -result {1}
+} -result 1
 test fCmd-16.9 {error while deleting file} -setup {
     catch {file delete -force -- tfa}
 } -constraints {unix notRoot notWsl} -body {
@@ -1785,7 +1795,7 @@ test fCmd-16.9 {error while deleting file} -setup {
 } -cleanup {
     file attributes tfa -permissions 0o777
     file delete -force tfa
-} -result {1}
+} -result 1
 test fCmd-16.10 {deleting multiple files} -constraints {notRoot} -setup {
     catch {file delete -force -- tfa1 tfa2}
 } -body {
@@ -1810,7 +1820,7 @@ test fCmd-17.1 {mkdir stat failing on target but not ENOENT} -setup {
 } -cleanup {
      file attributes tfa1 -permissions 0o777
      file delete -force tfa1
-} -result {1}
+} -result 1
 test fCmd-17.2 {mkdir several levels deep - relative} -setup {
     catch {file delete -force -- tfa}
 } -constraints {notRoot} -body {
@@ -1827,7 +1837,7 @@ test fCmd-17.3 {mkdir several levels deep - absolute} -setup {
     file isdir $f
 } -cleanup {
     file delete $f [file join [pwd] tfa]
-} -result {1}
+} -result 1
 
 #
 # Functionality tests for TclFileRenameCmd()
@@ -1988,7 +1998,7 @@ test fCmd-18.15 {TclFileRenameCmd : rename a file to a symlink dir} -setup {
     checkcontent tfa1/tfa2 $s
 } -cleanup {
     file delete -force tfa1 tfalink
-} -result {1}
+} -result 1
 test fCmd-18.16 {TclFileRenameCmd: rename a dangling symlink} -setup {
     catch {file delete -force -- tfa1 tfalink}
 } -constraints {unix notRoot} -body {
@@ -2021,7 +2031,7 @@ test fCmd-19.2 {rmdir error besides EEXIST} -setup {
 } -cleanup {
     file attributes tfa -permissions 0o777
     file delete -force tfa
-} -result {1}
+} -result 1
 test fCmd-19.3 {recursive remove} -constraints {notRoot} -setup {
     catch {file delete -force -- tfa}
 } -body {
@@ -2049,7 +2059,7 @@ test fCmd-20.1 {TraverseUnixTree : failure opening a subdirectory directory} -se
 } -cleanup {
     file attributes tfa/a -permissions 0o777
     file delete -force tfa
-} -result {1}
+} -result 1
 test fCmd-20.2 {TraverseUnixTree : recursive delete of large directory: Bug 1034337} -setup {
     catch {file delete -force -- tfa}
 } -constraints {unix notRoot} -body {
@@ -2102,7 +2112,7 @@ test fCmd-21.4 {copy : more than one source and target is not a directory} -setu
     catch {file copy tfa1 tfa2 tfa3}
 } -cleanup {
     file delete tfa1 tfa2 tfa3
-} -result {1}
+} -result 1
 test fCmd-21.5 {copy : multiple files into directory} -constraints {notRoot} -setup {
     catch {file delete -force -- tfa1 tfa2 tfad}
 } -body {
@@ -2227,7 +2237,7 @@ test fCmd-22.2 {TclpRenameFile: attempt to overwrite itself} -setup {
     checkcontent tfa1 $s
 } -cleanup {
     file delete tfa1
-} -result {1}
+} -result 1
 test fCmd-22.3 {TclpRenameFile: rename dir to existing dir} -setup {
     catch {file delete -force -- d1 tfad}
 } -constraints {notRoot} -body {
@@ -2450,7 +2460,7 @@ test fCmd-28.6 {file link: unsupported operation} -setup {
     file link -hard abc.link abc.dir
 } -returnCodes error -cleanup {
     cd [workingDirectory]
-} -result {could not create new link "abc.link" pointing to "abc.dir": illegal operation on a directory}
+} -result {could not create new link "abc.link" pointing to "abc.dir": is a directory}
 test fCmd-28.7 {file link: source already exists} -setup {
     cd [temporaryDirectory]
 } -constraints {linkFile} -body {
@@ -2687,7 +2697,7 @@ test fCmd-30.2 {file readable on 'NTUSER.DAT'} -constraints {win notWine} -body
     expr {[info exists env(USERPROFILE)]
           && [file exists $env(USERPROFILE)/NTUSER.DAT]
           && [file readable $env(USERPROFILE)/NTUSER.DAT]}
-} -result {1}
+} -result 1
 # At least one CI environment (GitHub Actions) is set up with the page file in
 # an unusual location; skip the test if that is so.
 test fCmd-30.3 {file readable on 'pagefile.sys'} -constraints {win notInCIenv} -body {
diff --git a/tests/fileName.test b/tests/fileName.test
index 416c419..f2db5e0 100644
--- a/tests/fileName.test
+++ b/tests/fileName.test
@@ -18,6 +18,7 @@ if {"::tcltest" ni [namespace children]} {
 
 ::tcltest::loadTestedCommands
 catch [list package require -exact tcl::test [info patchlevel]]
+source [file join [file dirname [info script]] tcltests.tcl]
 
 testConstraint testsetplatform [llength [info commands testsetplatform]]
 testConstraint testtranslatefilename [llength [info commands testtranslatefilename]]
@@ -1569,7 +1570,7 @@ test fileName-20.6 {Bug 2837800} -setup {
     cd $savewd
     removeDirectory ./~ $dd
     removeDirectory isolate
-    removeFile test ~
+    removeFile test [file home]
 } -result {}
 test fileName-20.7 {Bug 2806250} -setup {
     set savewd [pwd]
@@ -1609,6 +1610,61 @@ test fileName-20.10 {globbing for special chars} -setup {
     removeFile fileName-20.10 $s
     removeDirectory sub [file home]
 } -result [file home]/sub/fileName-20.10
+
+
+apply [list {} {
+    test fileName-6d4e9d1af5bf5b7d {
+	memory leak in SetFsPathFromAny
+
+	Runs under both a TCL_DEBUG_MEM build and a -DPURIFY build for
+	valgrind, which is useful since Valgrind provides information about the
+	error location, but [memory] doesn't.
+    } -setup {
+	if {[namespace which ::memory] eq {}} {
+	    set memcheckcmd [list ::apply [list script {
+		uplevel 1 $script
+		return 0
+	    } [namespace current]]]
+	} else {
+	    set memcheckcmd ::tcltests::scriptmemcheck
+	}
+    } -body {
+	{*}$memcheckcmd {
+	    set interp [interp create]
+	    interp eval $interp {
+		apply [list {} {
+		    upvar 1 f f
+
+		    # A unique name so that no internal representation of this
+		    # literal value has been picked up from any other script
+		    # that has alredy been sourced into this interpreter.
+		    set variableUniqueInTheEntireTclCodebase a
+		    set name variableUniqueInTheEntireTclCodebase
+
+		    # give the Tcl_Obj for "var1" an internal representation of
+		    # type 'localVarNameType'.
+		    set $name
+
+		    set f [open variableUniqueInTheEntireTclCodebase w]
+			try {
+				puts $f {some data}
+			} finally {
+				close $f
+			}
+
+		    set f [open variableUniqueInTheEntireTclCodebase]
+			try {
+				read $f
+			} finally {
+				catch {file delete variableUniqueInTheEntireTclCodebase}
+				close $f
+			}
+		} [namespace current]]
+	    }
+	    interp delete $interp
+	}
+    } -result 0
+} [namespace current]]
 
 # cleanup
 catch {file delete -force C:/globTest}
diff --git a/tests/fileSystem.test b/tests/fileSystem.test
index d104282..c338204 100644
--- a/tests/fileSystem.test
+++ b/tests/fileSystem.test
@@ -694,7 +694,7 @@ test filesystem-7.4 {cross-filesystem file copy with -force} -setup {
     file delete -force simplefile
     file delete -force file2
     cd $dir
-} -result {0 {} 1 {error copying "simplefs:/simplefile" to "file2": file already exists} 0 {} 1}
+} -result {0 {} 1 {error copying "simplefs:/simplefile" to "file2": file exists} 0 {} 1}
 test filesystem-7.5 {cross-filesystem file copy with -force} -setup {
     set dir [pwd]
     cd [tcltest::temporaryDirectory]
@@ -719,7 +719,7 @@ test filesystem-7.5 {cross-filesystem file copy with -force} -setup {
     file delete -force simplefile
     file delete -force file2
     cd $dir
-} -result {0 {} 1 {error copying "simplefs:/simplefile" to "file2": file already exists} 0 {} 1}
+} -result {0 {} 1 {error copying "simplefs:/simplefile" to "file2": file exists} 0 {} 1}
 test filesystem-7.6 {cross-filesystem dir copy with -force} -setup {
     set dir [pwd]
     cd [tcltest::temporaryDirectory]
@@ -747,7 +747,7 @@ test filesystem-7.6 {cross-filesystem dir copy with -force} -setup {
     file delete -force simpledir
     file delete -force dir2
     cd $dir
-} -result {0 {} 1 {error copying "simplefs:/simpledir" to "dir2/simpledir": file already exists} 0 {} 1 1}
+} -result {0 {} 1 {error copying "simplefs:/simpledir" to "dir2/simpledir": file exists} 0 {} 1 1}
 test filesystem-7.7 {cross-filesystem dir copy with -force} -setup {
     set dir [pwd]
     cd [tcltest::temporaryDirectory]
@@ -777,7 +777,7 @@ test filesystem-7.7 {cross-filesystem dir copy with -force} -setup {
     file delete -force simpledir
     file delete -force dir2
     cd $dir
-} -result {0 {} 1 {error copying "simplefs:/simpledir" to "dir2/simpledir": file already exists} 0 {} 1 1}
+} -result {0 {} 1 {error copying "simplefs:/simpledir" to "dir2/simpledir": file exists} 0 {} 1 1}
 removeFile gorp.file
 test filesystem-7.8 {vfs cd} -setup {
     set dir [pwd]
diff --git a/tests/http.test b/tests/http.test
index 3c2f4d8..73b405d 100644
--- a/tests/http.test
+++ b/tests/http.test
@@ -629,7 +629,7 @@ test http-4.14.$ThreadLevel {http::Event} -body {
     lindex [http::error $token] 0
 } -cleanup {
     catch {http::cleanup $token}
-} -result {connect failed connection refused}
+} -result {connect failed: connection refused}
 
 # Bogus host
 test http-4.15.$ThreadLevel {http::Event} -body {
@@ -712,6 +712,8 @@ test http-7.3.$ThreadLevel {http::formatQuery} -setup {
 } -result {unknown encoding ""}
 test http-7.4.$ThreadLevel {http::formatQuery} -setup {
     set enc [http::config -urlencoding]
+} -constraints {
+    knownProfileBug
 } -body {
     # this would be reverting to http <=2.4 behavior w/o errors
     # with Tcl 8.x (unknown chars become '?'), generating a
diff --git a/tests/httpd11.tcl b/tests/httpd11.tcl
index b605005..9e0edcd 100644
--- a/tests/httpd11.tcl
+++ b/tests/httpd11.tcl
@@ -150,7 +150,11 @@ proc Service {chan addr port} {
         if {[file exists $path] && [file isfile $path]} {
             foreach {what type} [mime-type $path] break
             set f [open $path r]
-            if {$what eq "binary"} {chan configure $f -translation binary}
+            if {$what eq "binary"} {
+                chan configure $f -translation binary
+            } else {
+                chan configure $f -encoding utf-8
+            }
             set data [read $f]
             close $f
             set code "200 OK"
diff --git a/tests/icuUcmTests.tcl b/tests/icuUcmTests.tcl
new file mode 100644
index 0000000..3b70748
--- /dev/null
+++ b/tests/icuUcmTests.tcl
@@ -0,0 +1,1891 @@
+
+# This file is automatically generated by ucm2tests.tcl.
+# Edits will be overwritten on next generation.
+#
+# Generates tests comparing Tcl encodings to ICU.
+# The generated file is NOT standalone. It should be sourced into a test script.
+
+proc ucmConvertfromMismatches {enc map} {
+    set mismatches {}
+    foreach {unihex hex} $map {
+        set unihex [string range 00000000$unihex end-7 end]; # Make 8 digits
+        set unich [subst "\\U$unihex"]
+        if {[encoding convertfrom -profile strict $enc [binary decode hex $hex]] ne $unich} {
+            lappend mismatches "<[printable $unich],$hex>"
+        }
+    }
+    return $mismatches
+}
+proc ucmConverttoMismatches {enc map} {
+    set mismatches {}
+    foreach {unihex hex} $map {
+        set unihex [string range 00000000$unihex end-7 end]; # Make 8 digits
+        set unich [subst "\\U$unihex"]
+        if {[encoding convertto -profile strict $enc $unich] ne [binary decode hex $hex]} {
+            lappend mismatches "<[printable $unich],$hex>"
+        }
+    }
+    return $mismatches
+}
+if {[info commands printable] eq ""} {
+    proc printable {s} {
+        set print ""
+        foreach c [split $s ""] {
+            set i [scan $c %c]
+            if {[string is print $c] && ($i <= 127)} {
+                append print $c
+            } elseif {$i <= 0xff} {
+                append print \\x[format %02X $i]
+            } elseif {$i <= 0xffff} {
+                append print \\u[format %04X $i]
+            } else {
+                append print \\U[format %08X $i]
+            }
+        }
+        return $print
+    }
+}
+
+
+#
+# cp1250 (generated from glibc-CP1250-2.1.2)
+
+test encoding-convertfrom-ucmCompare-cp1250 {Compare against ICU UCM} -body {
+    ucmConvertfromMismatches cp1250 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 00A0 A0 00A4 A4 00A6 A6 00A7 A7 00A8 A8 00A9 A9 00AB AB 00AC AC 00AD AD 00AE AE 00B0 B0 00B1 B1 00B4 B4 00B5 B5 00B6 B6 00B7 B7 00B8 B8 00BB BB 00C1 C1 00C2 C2 00C4 C4 00C7 C7 00C9 C9 00CB CB 00CD CD 00CE CE 00D3 D3 00D4 D4 00D6 D6 00D7 D7 00DA DA 00DC DC 00DD DD 00DF DF 00E1 E1 00E2 E2 00E4 E4 00E7 E7 00E9 E9 00EB EB 00ED ED 00EE EE 00F3 F3 00F4 F4 00F6 F6 00F7 F7 00FA FA 00FC FC 00FD FD 0102 C3 0103 E3 0104 A5 0105 B9 0106 C6 0107 E6 010C C8 010D E8 010E CF 010F EF 0110 D0 0111 F0 0118 CA 0119 EA 011A CC 011B EC 0139 C5 013A E5 013D BC 013E BE 0141 A3 0142 B3 0143 D1 0144 F1 0147 D2 0148 F2 0150 D5 0151 F5 0154 C0 0155 E0 0158 D8 0159 F8 015A 8C 015B 9C 015E AA 015F BA 0160 8A 0161 9A 0162 DE 0163 FE 0164 8D 0165 9D 016E D9 016F F9 0170 DB 0171 FB 0179 8F 017A 9F 017B AF 017C BF 017D 8E 017E 9E 02C7 A1 02D8 A2 02D9 FF 02DB B2 02DD BD 2013 96 2014 97 2018 91 2019 92 201A 82 201C 93 201D 94 201E 84 2020 86 2021 87 2022 95 2026 85 2030 89 2039 8B 203A 9B 20AC 80 2122 99}
+} -result {}
+
+test encoding-convertto-ucmCompare-cp1250 {Compare against ICU UCM} -body {
+    ucmConverttoMismatches cp1250 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 00A0 A0 00A4 A4 00A6 A6 00A7 A7 00A8 A8 00A9 A9 00AB AB 00AC AC 00AD AD 00AE AE 00B0 B0 00B1 B1 00B4 B4 00B5 B5 00B6 B6 00B7 B7 00B8 B8 00BB BB 00C1 C1 00C2 C2 00C4 C4 00C7 C7 00C9 C9 00CB CB 00CD CD 00CE CE 00D3 D3 00D4 D4 00D6 D6 00D7 D7 00DA DA 00DC DC 00DD DD 00DF DF 00E1 E1 00E2 E2 00E4 E4 00E7 E7 00E9 E9 00EB EB 00ED ED 00EE EE 00F3 F3 00F4 F4 00F6 F6 00F7 F7 00FA FA 00FC FC 00FD FD 0102 C3 0103 E3 0104 A5 0105 B9 0106 C6 0107 E6 010C C8 010D E8 010E CF 010F EF 0110 D0 0111 F0 0118 CA 0119 EA 011A CC 011B EC 0139 C5 013A E5 013D BC 013E BE 0141 A3 0142 B3 0143 D1 0144 F1 0147 D2 0148 F2 0150 D5 0151 F5 0154 C0 0155 E0 0158 D8 0159 F8 015A 8C 015B 9C 015E AA 015F BA 0160 8A 0161 9A 0162 DE 0163 FE 0164 8D 0165 9D 016E D9 016F F9 0170 DB 0171 FB 0179 8F 017A 9F 017B AF 017C BF 017D 8E 017E 9E 02C7 A1 02D8 A2 02D9 FF 02DB B2 02DD BD 2013 96 2014 97 2018 91 2019 92 201A 82 201C 93 201D 94 201E 84 2020 86 2021 87 2022 95 2026 85 2030 89 2039 8B 203A 9B 20AC 80 2122 99}
+} -result {}
+
+# cp1250 - invalid byte sequences
+lappend encInvalidBytes {*}{
+    cp1250 81 tcl8    \U00000081 -1 {} {}
+    cp1250 81 replace \uFFFD -1 {} {}
+    cp1250 81 strict  {}       0 {} {}
+    cp1250 83 tcl8    \U00000083 -1 {} {}
+    cp1250 83 replace \uFFFD -1 {} {}
+    cp1250 83 strict  {}       0 {} {}
+    cp1250 88 tcl8    \U00000088 -1 {} {}
+    cp1250 88 replace \uFFFD -1 {} {}
+    cp1250 88 strict  {}       0 {} {}
+    cp1250 90 tcl8    \U00000090 -1 {} {}
+    cp1250 90 replace \uFFFD -1 {} {}
+    cp1250 90 strict  {}       0 {} {}
+    cp1250 98 tcl8    \U00000098 -1 {} {}
+    cp1250 98 replace \uFFFD -1 {} {}
+    cp1250 98 strict  {}       0 {} {}
+}; # cp1250
+
+# cp1250 - invalid byte sequences
+lappend encUnencodableStrings {*}{
+    cp1250 \U00000080 tcl8    1A -1 {} {}
+    cp1250 \U00000080 replace 1A -1 {} {}
+    cp1250 \U00000080 strict  {}                      0 {} {}
+    cp1250 \U00000400 tcl8    1A -1 {} {}
+    cp1250 \U00000400 replace 1A -1 {} {}
+    cp1250 \U00000400 strict  {}                      0 {} {}
+    cp1250 \U0000D800 tcl8    1A -1 {} {}
+    cp1250 \U0000D800 replace 1A -1 {} {}
+    cp1250 \U0000D800 strict  {}                      0 {} {}
+    cp1250 \U0000DC00 tcl8    1A -1 {} {}
+    cp1250 \U0000DC00 replace 1A -1 {} {}
+    cp1250 \U0000DC00 strict  {}                      0 {} {}
+    cp1250 \U00010000 tcl8    1A -1 {} {}
+    cp1250 \U00010000 replace 1A -1 {} {}
+    cp1250 \U00010000 strict  {}                      0 {} {}
+    cp1250 \U0010FFFF tcl8    1A -1 {} {}
+    cp1250 \U0010FFFF replace 1A -1 {} {}
+    cp1250 \U0010FFFF strict  {}                      0 {} {}
+}; # cp1250
+
+#
+# cp1251 (generated from glibc-CP1251-2.1.2)
+
+test encoding-convertfrom-ucmCompare-cp1251 {Compare against ICU UCM} -body {
+    ucmConvertfromMismatches cp1251 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 00A0 A0 00A4 A4 00A6 A6 00A7 A7 00A9 A9 00AB AB 00AC AC 00AD AD 00AE AE 00B0 B0 00B1 B1 00B5 B5 00B6 B6 00B7 B7 00BB BB 0401 A8 0402 80 0403 81 0404 AA 0405 BD 0406 B2 0407 AF 0408 A3 0409 8A 040A 8C 040B 8E 040C 8D 040E A1 040F 8F 0410 C0 0411 C1 0412 C2 0413 C3 0414 C4 0415 C5 0416 C6 0417 C7 0418 C8 0419 C9 041A CA 041B CB 041C CC 041D CD 041E CE 041F CF 0420 D0 0421 D1 0422 D2 0423 D3 0424 D4 0425 D5 0426 D6 0427 D7 0428 D8 0429 D9 042A DA 042B DB 042C DC 042D DD 042E DE 042F DF 0430 E0 0431 E1 0432 E2 0433 E3 0434 E4 0435 E5 0436 E6 0437 E7 0438 E8 0439 E9 043A EA 043B EB 043C EC 043D ED 043E EE 043F EF 0440 F0 0441 F1 0442 F2 0443 F3 0444 F4 0445 F5 0446 F6 0447 F7 0448 F8 0449 F9 044A FA 044B FB 044C FC 044D FD 044E FE 044F FF 0451 B8 0452 90 0453 83 0454 BA 0455 BE 0456 B3 0457 BF 0458 BC 0459 9A 045A 9C 045B 9E 045C 9D 045E A2 045F 9F 0490 A5 0491 B4 2013 96 2014 97 2018 91 2019 92 201A 82 201C 93 201D 94 201E 84 2020 86 2021 87 2022 95 2026 85 2030 89 2039 8B 203A 9B 20AC 88 2116 B9 2122 99}
+} -result {}
+
+test encoding-convertto-ucmCompare-cp1251 {Compare against ICU UCM} -body {
+    ucmConverttoMismatches cp1251 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 00A0 A0 00A4 A4 00A6 A6 00A7 A7 00A9 A9 00AB AB 00AC AC 00AD AD 00AE AE 00B0 B0 00B1 B1 00B5 B5 00B6 B6 00B7 B7 00BB BB 0401 A8 0402 80 0403 81 0404 AA 0405 BD 0406 B2 0407 AF 0408 A3 0409 8A 040A 8C 040B 8E 040C 8D 040E A1 040F 8F 0410 C0 0411 C1 0412 C2 0413 C3 0414 C4 0415 C5 0416 C6 0417 C7 0418 C8 0419 C9 041A CA 041B CB 041C CC 041D CD 041E CE 041F CF 0420 D0 0421 D1 0422 D2 0423 D3 0424 D4 0425 D5 0426 D6 0427 D7 0428 D8 0429 D9 042A DA 042B DB 042C DC 042D DD 042E DE 042F DF 0430 E0 0431 E1 0432 E2 0433 E3 0434 E4 0435 E5 0436 E6 0437 E7 0438 E8 0439 E9 043A EA 043B EB 043C EC 043D ED 043E EE 043F EF 0440 F0 0441 F1 0442 F2 0443 F3 0444 F4 0445 F5 0446 F6 0447 F7 0448 F8 0449 F9 044A FA 044B FB 044C FC 044D FD 044E FE 044F FF 0451 B8 0452 90 0453 83 0454 BA 0455 BE 0456 B3 0457 BF 0458 BC 0459 9A 045A 9C 045B 9E 045C 9D 045E A2 045F 9F 0490 A5 0491 B4 2013 96 2014 97 2018 91 2019 92 201A 82 201C 93 201D 94 201E 84 2020 86 2021 87 2022 95 2026 85 2030 89 2039 8B 203A 9B 20AC 88 2116 B9 2122 99}
+} -result {}
+
+# cp1251 - invalid byte sequences
+lappend encInvalidBytes {*}{
+    cp1251 98 tcl8    \U00000098 -1 {} {}
+    cp1251 98 replace \uFFFD -1 {} {}
+    cp1251 98 strict  {}       0 {} {}
+}; # cp1251
+
+# cp1251 - invalid byte sequences
+lappend encUnencodableStrings {*}{
+    cp1251 \U00000080 tcl8    1A -1 {} {}
+    cp1251 \U00000080 replace 1A -1 {} {}
+    cp1251 \U00000080 strict  {}                      0 {} {}
+    cp1251 \U00000400 tcl8    1A -1 {} {}
+    cp1251 \U00000400 replace 1A -1 {} {}
+    cp1251 \U00000400 strict  {}                      0 {} {}
+    cp1251 \U0000D800 tcl8    1A -1 {} {}
+    cp1251 \U0000D800 replace 1A -1 {} {}
+    cp1251 \U0000D800 strict  {}                      0 {} {}
+    cp1251 \U0000DC00 tcl8    1A -1 {} {}
+    cp1251 \U0000DC00 replace 1A -1 {} {}
+    cp1251 \U0000DC00 strict  {}                      0 {} {}
+    cp1251 \U00010000 tcl8    1A -1 {} {}
+    cp1251 \U00010000 replace 1A -1 {} {}
+    cp1251 \U00010000 strict  {}                      0 {} {}
+    cp1251 \U0010FFFF tcl8    1A -1 {} {}
+    cp1251 \U0010FFFF replace 1A -1 {} {}
+    cp1251 \U0010FFFF strict  {}                      0 {} {}
+}; # cp1251
+
+#
+# cp1252 (generated from glibc-CP1252-2.1.2)
+
+test encoding-convertfrom-ucmCompare-cp1252 {Compare against ICU UCM} -body {
+    ucmConvertfromMismatches cp1252 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 00A0 A0 00A1 A1 00A2 A2 00A3 A3 00A4 A4 00A5 A5 00A6 A6 00A7 A7 00A8 A8 00A9 A9 00AA AA 00AB AB 00AC AC 00AD AD 00AE AE 00AF AF 00B0 B0 00B1 B1 00B2 B2 00B3 B3 00B4 B4 00B5 B5 00B6 B6 00B7 B7 00B8 B8 00B9 B9 00BA BA 00BB BB 00BC BC 00BD BD 00BE BE 00BF BF 00C0 C0 00C1 C1 00C2 C2 00C3 C3 00C4 C4 00C5 C5 00C6 C6 00C7 C7 00C8 C8 00C9 C9 00CA CA 00CB CB 00CC CC 00CD CD 00CE CE 00CF CF 00D0 D0 00D1 D1 00D2 D2 00D3 D3 00D4 D4 00D5 D5 00D6 D6 00D7 D7 00D8 D8 00D9 D9 00DA DA 00DB DB 00DC DC 00DD DD 00DE DE 00DF DF 00E0 E0 00E1 E1 00E2 E2 00E3 E3 00E4 E4 00E5 E5 00E6 E6 00E7 E7 00E8 E8 00E9 E9 00EA EA 00EB EB 00EC EC 00ED ED 00EE EE 00EF EF 00F0 F0 00F1 F1 00F2 F2 00F3 F3 00F4 F4 00F5 F5 00F6 F6 00F7 F7 00F8 F8 00F9 F9 00FA FA 00FB FB 00FC FC 00FD FD 00FE FE 00FF FF 0152 8C 0153 9C 0160 8A 0161 9A 0178 9F 017D 8E 017E 9E 0192 83 02C6 88 02DC 98 2013 96 2014 97 2018 91 2019 92 201A 82 201C 93 201D 94 201E 84 2020 86 2021 87 2022 95 2026 85 2030 89 2039 8B 203A 9B 20AC 80 2122 99}
+} -result {}
+
+test encoding-convertto-ucmCompare-cp1252 {Compare against ICU UCM} -body {
+    ucmConverttoMismatches cp1252 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 00A0 A0 00A1 A1 00A2 A2 00A3 A3 00A4 A4 00A5 A5 00A6 A6 00A7 A7 00A8 A8 00A9 A9 00AA AA 00AB AB 00AC AC 00AD AD 00AE AE 00AF AF 00B0 B0 00B1 B1 00B2 B2 00B3 B3 00B4 B4 00B5 B5 00B6 B6 00B7 B7 00B8 B8 00B9 B9 00BA BA 00BB BB 00BC BC 00BD BD 00BE BE 00BF BF 00C0 C0 00C1 C1 00C2 C2 00C3 C3 00C4 C4 00C5 C5 00C6 C6 00C7 C7 00C8 C8 00C9 C9 00CA CA 00CB CB 00CC CC 00CD CD 00CE CE 00CF CF 00D0 D0 00D1 D1 00D2 D2 00D3 D3 00D4 D4 00D5 D5 00D6 D6 00D7 D7 00D8 D8 00D9 D9 00DA DA 00DB DB 00DC DC 00DD DD 00DE DE 00DF DF 00E0 E0 00E1 E1 00E2 E2 00E3 E3 00E4 E4 00E5 E5 00E6 E6 00E7 E7 00E8 E8 00E9 E9 00EA EA 00EB EB 00EC EC 00ED ED 00EE EE 00EF EF 00F0 F0 00F1 F1 00F2 F2 00F3 F3 00F4 F4 00F5 F5 00F6 F6 00F7 F7 00F8 F8 00F9 F9 00FA FA 00FB FB 00FC FC 00FD FD 00FE FE 00FF FF 0152 8C 0153 9C 0160 8A 0161 9A 0178 9F 017D 8E 017E 9E 0192 83 02C6 88 02DC 98 2013 96 2014 97 2018 91 2019 92 201A 82 201C 93 201D 94 201E 84 2020 86 2021 87 2022 95 2026 85 2030 89 2039 8B 203A 9B 20AC 80 2122 99}
+} -result {}
+
+# cp1252 - invalid byte sequences
+lappend encInvalidBytes {*}{
+    cp1252 81 tcl8    \U00000081 -1 {} {}
+    cp1252 81 replace \uFFFD -1 {} {}
+    cp1252 81 strict  {}       0 {} {}
+    cp1252 8D tcl8    \U0000008D -1 {} {}
+    cp1252 8D replace \uFFFD -1 {} {}
+    cp1252 8D strict  {}       0 {} {}
+    cp1252 8F tcl8    \U0000008F -1 {} {}
+    cp1252 8F replace \uFFFD -1 {} {}
+    cp1252 8F strict  {}       0 {} {}
+    cp1252 90 tcl8    \U00000090 -1 {} {}
+    cp1252 90 replace \uFFFD -1 {} {}
+    cp1252 90 strict  {}       0 {} {}
+    cp1252 9D tcl8    \U0000009D -1 {} {}
+    cp1252 9D replace \uFFFD -1 {} {}
+    cp1252 9D strict  {}       0 {} {}
+}; # cp1252
+
+# cp1252 - invalid byte sequences
+lappend encUnencodableStrings {*}{
+    cp1252 \U00000080 tcl8    1A -1 {} {}
+    cp1252 \U00000080 replace 1A -1 {} {}
+    cp1252 \U00000080 strict  {}                      0 {} {}
+    cp1252 \U00000400 tcl8    1A -1 {} {}
+    cp1252 \U00000400 replace 1A -1 {} {}
+    cp1252 \U00000400 strict  {}                      0 {} {}
+    cp1252 \U0000D800 tcl8    1A -1 {} {}
+    cp1252 \U0000D800 replace 1A -1 {} {}
+    cp1252 \U0000D800 strict  {}                      0 {} {}
+    cp1252 \U0000DC00 tcl8    1A -1 {} {}
+    cp1252 \U0000DC00 replace 1A -1 {} {}
+    cp1252 \U0000DC00 strict  {}                      0 {} {}
+    cp1252 \U00010000 tcl8    1A -1 {} {}
+    cp1252 \U00010000 replace 1A -1 {} {}
+    cp1252 \U00010000 strict  {}                      0 {} {}
+    cp1252 \U0010FFFF tcl8    1A -1 {} {}
+    cp1252 \U0010FFFF replace 1A -1 {} {}
+    cp1252 \U0010FFFF strict  {}                      0 {} {}
+}; # cp1252
+
+#
+# cp1253 (generated from glibc-CP1253-2.1.2)
+
+test encoding-convertfrom-ucmCompare-cp1253 {Compare against ICU UCM} -body {
+    ucmConvertfromMismatches cp1253 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 00A0 A0 00A3 A3 00A4 A4 00A5 A5 00A6 A6 00A7 A7 00A8 A8 00A9 A9 00AB AB 00AC AC 00AD AD 00AE AE 00B0 B0 00B1 B1 00B2 B2 00B3 B3 00B5 B5 00B6 B6 00B7 B7 00BB BB 00BD BD 0192 83 0384 B4 0385 A1 0386 A2 0388 B8 0389 B9 038A BA 038C BC 038E BE 038F BF 0390 C0 0391 C1 0392 C2 0393 C3 0394 C4 0395 C5 0396 C6 0397 C7 0398 C8 0399 C9 039A CA 039B CB 039C CC 039D CD 039E CE 039F CF 03A0 D0 03A1 D1 03A3 D3 03A4 D4 03A5 D5 03A6 D6 03A7 D7 03A8 D8 03A9 D9 03AA DA 03AB DB 03AC DC 03AD DD 03AE DE 03AF DF 03B0 E0 03B1 E1 03B2 E2 03B3 E3 03B4 E4 03B5 E5 03B6 E6 03B7 E7 03B8 E8 03B9 E9 03BA EA 03BB EB 03BC EC 03BD ED 03BE EE 03BF EF 03C0 F0 03C1 F1 03C2 F2 03C3 F3 03C4 F4 03C5 F5 03C6 F6 03C7 F7 03C8 F8 03C9 F9 03CA FA 03CB FB 03CC FC 03CD FD 03CE FE 2013 96 2014 97 2015 AF 2018 91 2019 92 201A 82 201C 93 201D 94 201E 84 2020 86 2021 87 2022 95 2026 85 2030 89 2039 8B 203A 9B 20AC 80 2122 99}
+} -result {}
+
+test encoding-convertto-ucmCompare-cp1253 {Compare against ICU UCM} -body {
+    ucmConverttoMismatches cp1253 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 00A0 A0 00A3 A3 00A4 A4 00A5 A5 00A6 A6 00A7 A7 00A8 A8 00A9 A9 00AB AB 00AC AC 00AD AD 00AE AE 00B0 B0 00B1 B1 00B2 B2 00B3 B3 00B5 B5 00B6 B6 00B7 B7 00BB BB 00BD BD 0192 83 0384 B4 0385 A1 0386 A2 0388 B8 0389 B9 038A BA 038C BC 038E BE 038F BF 0390 C0 0391 C1 0392 C2 0393 C3 0394 C4 0395 C5 0396 C6 0397 C7 0398 C8 0399 C9 039A CA 039B CB 039C CC 039D CD 039E CE 039F CF 03A0 D0 03A1 D1 03A3 D3 03A4 D4 03A5 D5 03A6 D6 03A7 D7 03A8 D8 03A9 D9 03AA DA 03AB DB 03AC DC 03AD DD 03AE DE 03AF DF 03B0 E0 03B1 E1 03B2 E2 03B3 E3 03B4 E4 03B5 E5 03B6 E6 03B7 E7 03B8 E8 03B9 E9 03BA EA 03BB EB 03BC EC 03BD ED 03BE EE 03BF EF 03C0 F0 03C1 F1 03C2 F2 03C3 F3 03C4 F4 03C5 F5 03C6 F6 03C7 F7 03C8 F8 03C9 F9 03CA FA 03CB FB 03CC FC 03CD FD 03CE FE 2013 96 2014 97 2015 AF 2018 91 2019 92 201A 82 201C 93 201D 94 201E 84 2020 86 2021 87 2022 95 2026 85 2030 89 2039 8B 203A 9B 20AC 80 2122 99}
+} -result {}
+
+# cp1253 - invalid byte sequences
+lappend encInvalidBytes {*}{
+    cp1253 81 tcl8    \U00000081 -1 {} {}
+    cp1253 81 replace \uFFFD -1 {} {}
+    cp1253 81 strict  {}       0 {} {}
+    cp1253 88 tcl8    \U00000088 -1 {} {}
+    cp1253 88 replace \uFFFD -1 {} {}
+    cp1253 88 strict  {}       0 {} {}
+    cp1253 8A tcl8    \U0000008A -1 {} {}
+    cp1253 8A replace \uFFFD -1 {} {}
+    cp1253 8A strict  {}       0 {} {}
+    cp1253 8C tcl8    \U0000008C -1 {} {}
+    cp1253 8C replace \uFFFD -1 {} {}
+    cp1253 8C strict  {}       0 {} {}
+    cp1253 8D tcl8    \U0000008D -1 {} {}
+    cp1253 8D replace \uFFFD -1 {} {}
+    cp1253 8D strict  {}       0 {} {}
+    cp1253 8E tcl8    \U0000008E -1 {} {}
+    cp1253 8E replace \uFFFD -1 {} {}
+    cp1253 8E strict  {}       0 {} {}
+    cp1253 8F tcl8    \U0000008F -1 {} {}
+    cp1253 8F replace \uFFFD -1 {} {}
+    cp1253 8F strict  {}       0 {} {}
+    cp1253 90 tcl8    \U00000090 -1 {} {}
+    cp1253 90 replace \uFFFD -1 {} {}
+    cp1253 90 strict  {}       0 {} {}
+    cp1253 98 tcl8    \U00000098 -1 {} {}
+    cp1253 98 replace \uFFFD -1 {} {}
+    cp1253 98 strict  {}       0 {} {}
+    cp1253 9A tcl8    \U0000009A -1 {} {}
+    cp1253 9A replace \uFFFD -1 {} {}
+    cp1253 9A strict  {}       0 {} {}
+    cp1253 9C tcl8    \U0000009C -1 {} {}
+    cp1253 9C replace \uFFFD -1 {} {}
+    cp1253 9C strict  {}       0 {} {}
+    cp1253 9D tcl8    \U0000009D -1 {} {}
+    cp1253 9D replace \uFFFD -1 {} {}
+    cp1253 9D strict  {}       0 {} {}
+    cp1253 9E tcl8    \U0000009E -1 {} {}
+    cp1253 9E replace \uFFFD -1 {} {}
+    cp1253 9E strict  {}       0 {} {}
+    cp1253 9F tcl8    \U0000009F -1 {} {}
+    cp1253 9F replace \uFFFD -1 {} {}
+    cp1253 9F strict  {}       0 {} {}
+    cp1253 AA tcl8    \U000000AA -1 {} {}
+    cp1253 AA replace \uFFFD -1 {} {}
+    cp1253 AA strict  {}       0 {} {}
+    cp1253 D2 tcl8    \U000000D2 -1 {} {}
+    cp1253 D2 replace \uFFFD -1 {} {}
+    cp1253 D2 strict  {}       0 {} {}
+    cp1253 FF tcl8    \U000000FF -1 {} {}
+    cp1253 FF replace \uFFFD -1 {} {}
+    cp1253 FF strict  {}       0 {} {}
+}; # cp1253
+
+# cp1253 - invalid byte sequences
+lappend encUnencodableStrings {*}{
+    cp1253 \U00000080 tcl8    1A -1 {} {}
+    cp1253 \U00000080 replace 1A -1 {} {}
+    cp1253 \U00000080 strict  {}                      0 {} {}
+    cp1253 \U00000400 tcl8    1A -1 {} {}
+    cp1253 \U00000400 replace 1A -1 {} {}
+    cp1253 \U00000400 strict  {}                      0 {} {}
+    cp1253 \U0000D800 tcl8    1A -1 {} {}
+    cp1253 \U0000D800 replace 1A -1 {} {}
+    cp1253 \U0000D800 strict  {}                      0 {} {}
+    cp1253 \U0000DC00 tcl8    1A -1 {} {}
+    cp1253 \U0000DC00 replace 1A -1 {} {}
+    cp1253 \U0000DC00 strict  {}                      0 {} {}
+    cp1253 \U00010000 tcl8    1A -1 {} {}
+    cp1253 \U00010000 replace 1A -1 {} {}
+    cp1253 \U00010000 strict  {}                      0 {} {}
+    cp1253 \U0010FFFF tcl8    1A -1 {} {}
+    cp1253 \U0010FFFF replace 1A -1 {} {}
+    cp1253 \U0010FFFF strict  {}                      0 {} {}
+}; # cp1253
+
+#
+# cp1254 (generated from glibc-CP1254-2.1.2)
+
+test encoding-convertfrom-ucmCompare-cp1254 {Compare against ICU UCM} -body {
+    ucmConvertfromMismatches cp1254 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 00A0 A0 00A1 A1 00A2 A2 00A3 A3 00A4 A4 00A5 A5 00A6 A6 00A7 A7 00A8 A8 00A9 A9 00AA AA 00AB AB 00AC AC 00AD AD 00AE AE 00AF AF 00B0 B0 00B1 B1 00B2 B2 00B3 B3 00B4 B4 00B5 B5 00B6 B6 00B7 B7 00B8 B8 00B9 B9 00BA BA 00BB BB 00BC BC 00BD BD 00BE BE 00BF BF 00C0 C0 00C1 C1 00C2 C2 00C3 C3 00C4 C4 00C5 C5 00C6 C6 00C7 C7 00C8 C8 00C9 C9 00CA CA 00CB CB 00CC CC 00CD CD 00CE CE 00CF CF 00D1 D1 00D2 D2 00D3 D3 00D4 D4 00D5 D5 00D6 D6 00D7 D7 00D8 D8 00D9 D9 00DA DA 00DB DB 00DC DC 00DF DF 00E0 E0 00E1 E1 00E2 E2 00E3 E3 00E4 E4 00E5 E5 00E6 E6 00E7 E7 00E8 E8 00E9 E9 00EA EA 00EB EB 00EC EC 00ED ED 00EE EE 00EF EF 00F1 F1 00F2 F2 00F3 F3 00F4 F4 00F5 F5 00F6 F6 00F7 F7 00F8 F8 00F9 F9 00FA FA 00FB FB 00FC FC 00FF FF 011E D0 011F F0 0130 DD 0131 FD 0152 8C 0153 9C 015E DE 015F FE 0160 8A 0161 9A 0178 9F 0192 83 02C6 88 02DC 98 2013 96 2014 97 2018 91 2019 92 201A 82 201C 93 201D 94 201E 84 2020 86 2021 87 2022 95 2026 85 2030 89 2039 8B 203A 9B 20AC 80 2122 99}
+} -result {}
+
+test encoding-convertto-ucmCompare-cp1254 {Compare against ICU UCM} -body {
+    ucmConverttoMismatches cp1254 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 00A0 A0 00A1 A1 00A2 A2 00A3 A3 00A4 A4 00A5 A5 00A6 A6 00A7 A7 00A8 A8 00A9 A9 00AA AA 00AB AB 00AC AC 00AD AD 00AE AE 00AF AF 00B0 B0 00B1 B1 00B2 B2 00B3 B3 00B4 B4 00B5 B5 00B6 B6 00B7 B7 00B8 B8 00B9 B9 00BA BA 00BB BB 00BC BC 00BD BD 00BE BE 00BF BF 00C0 C0 00C1 C1 00C2 C2 00C3 C3 00C4 C4 00C5 C5 00C6 C6 00C7 C7 00C8 C8 00C9 C9 00CA CA 00CB CB 00CC CC 00CD CD 00CE CE 00CF CF 00D1 D1 00D2 D2 00D3 D3 00D4 D4 00D5 D5 00D6 D6 00D7 D7 00D8 D8 00D9 D9 00DA DA 00DB DB 00DC DC 00DF DF 00E0 E0 00E1 E1 00E2 E2 00E3 E3 00E4 E4 00E5 E5 00E6 E6 00E7 E7 00E8 E8 00E9 E9 00EA EA 00EB EB 00EC EC 00ED ED 00EE EE 00EF EF 00F1 F1 00F2 F2 00F3 F3 00F4 F4 00F5 F5 00F6 F6 00F7 F7 00F8 F8 00F9 F9 00FA FA 00FB FB 00FC FC 00FF FF 011E D0 011F F0 0130 DD 0131 FD 0152 8C 0153 9C 015E DE 015F FE 0160 8A 0161 9A 0178 9F 0192 83 02C6 88 02DC 98 2013 96 2014 97 2018 91 2019 92 201A 82 201C 93 201D 94 201E 84 2020 86 2021 87 2022 95 2026 85 2030 89 2039 8B 203A 9B 20AC 80 2122 99}
+} -result {}
+
+# cp1254 - invalid byte sequences
+lappend encInvalidBytes {*}{
+    cp1254 81 tcl8    \U00000081 -1 {} {}
+    cp1254 81 replace \uFFFD -1 {} {}
+    cp1254 81 strict  {}       0 {} {}
+    cp1254 8D tcl8    \U0000008D -1 {} {}
+    cp1254 8D replace \uFFFD -1 {} {}
+    cp1254 8D strict  {}       0 {} {}
+    cp1254 8E tcl8    \U0000008E -1 {} {}
+    cp1254 8E replace \uFFFD -1 {} {}
+    cp1254 8E strict  {}       0 {} {}
+    cp1254 8F tcl8    \U0000008F -1 {} {}
+    cp1254 8F replace \uFFFD -1 {} {}
+    cp1254 8F strict  {}       0 {} {}
+    cp1254 90 tcl8    \U00000090 -1 {} {}
+    cp1254 90 replace \uFFFD -1 {} {}
+    cp1254 90 strict  {}       0 {} {}
+    cp1254 9D tcl8    \U0000009D -1 {} {}
+    cp1254 9D replace \uFFFD -1 {} {}
+    cp1254 9D strict  {}       0 {} {}
+    cp1254 9E tcl8    \U0000009E -1 {} {}
+    cp1254 9E replace \uFFFD -1 {} {}
+    cp1254 9E strict  {}       0 {} {}
+}; # cp1254
+
+# cp1254 - invalid byte sequences
+lappend encUnencodableStrings {*}{
+    cp1254 \U00000080 tcl8    1A -1 {} {}
+    cp1254 \U00000080 replace 1A -1 {} {}
+    cp1254 \U00000080 strict  {}                      0 {} {}
+    cp1254 \U00000400 tcl8    1A -1 {} {}
+    cp1254 \U00000400 replace 1A -1 {} {}
+    cp1254 \U00000400 strict  {}                      0 {} {}
+    cp1254 \U0000D800 tcl8    1A -1 {} {}
+    cp1254 \U0000D800 replace 1A -1 {} {}
+    cp1254 \U0000D800 strict  {}                      0 {} {}
+    cp1254 \U0000DC00 tcl8    1A -1 {} {}
+    cp1254 \U0000DC00 replace 1A -1 {} {}
+    cp1254 \U0000DC00 strict  {}                      0 {} {}
+    cp1254 \U00010000 tcl8    1A -1 {} {}
+    cp1254 \U00010000 replace 1A -1 {} {}
+    cp1254 \U00010000 strict  {}                      0 {} {}
+    cp1254 \U0010FFFF tcl8    1A -1 {} {}
+    cp1254 \U0010FFFF replace 1A -1 {} {}
+    cp1254 \U0010FFFF strict  {}                      0 {} {}
+}; # cp1254
+
+#
+# cp1255 (generated from glibc-CP1255-2.1.2)
+
+test encoding-convertfrom-ucmCompare-cp1255 {Compare against ICU UCM} -body {
+    ucmConvertfromMismatches cp1255 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 00A0 A0 00A1 A1 00A2 A2 00A3 A3 00A5 A5 00A6 A6 00A7 A7 00A8 A8 00A9 A9 00AB AB 00AC AC 00AD AD 00AE AE 00AF AF 00B0 B0 00B1 B1 00B2 B2 00B3 B3 00B4 B4 00B5 B5 00B6 B6 00B7 B7 00B8 B8 00B9 B9 00BB BB 00BC BC 00BD BD 00BE BE 00BF BF 00D7 AA 00F7 BA 0192 83 02C6 88 02DC 98 05B0 C0 05B1 C1 05B2 C2 05B3 C3 05B4 C4 05B5 C5 05B6 C6 05B7 C7 05B8 C8 05B9 C9 05BB CB 05BC CC 05BD CD 05BE CE 05BF CF 05C0 D0 05C1 D1 05C2 D2 05C3 D3 05D0 E0 05D1 E1 05D2 E2 05D3 E3 05D4 E4 05D5 E5 05D6 E6 05D7 E7 05D8 E8 05D9 E9 05DA EA 05DB EB 05DC EC 05DD ED 05DE EE 05DF EF 05E0 F0 05E1 F1 05E2 F2 05E3 F3 05E4 F4 05E5 F5 05E6 F6 05E7 F7 05E8 F8 05E9 F9 05EA FA 05F0 D4 05F1 D5 05F2 D6 05F3 D7 05F4 D8 200E FD 200F FE 2013 96 2014 97 2018 91 2019 92 201A 82 201C 93 201D 94 201E 84 2020 86 2021 87 2022 95 2026 85 2030 89 2039 8B 203A 9B 20AA A4 20AC 80 2122 99}
+} -result {}
+
+test encoding-convertto-ucmCompare-cp1255 {Compare against ICU UCM} -body {
+    ucmConverttoMismatches cp1255 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 00A0 A0 00A1 A1 00A2 A2 00A3 A3 00A5 A5 00A6 A6 00A7 A7 00A8 A8 00A9 A9 00AB AB 00AC AC 00AD AD 00AE AE 00AF AF 00B0 B0 00B1 B1 00B2 B2 00B3 B3 00B4 B4 00B5 B5 00B6 B6 00B7 B7 00B8 B8 00B9 B9 00BB BB 00BC BC 00BD BD 00BE BE 00BF BF 00D7 AA 00F7 BA 0192 83 02C6 88 02DC 98 05B0 C0 05B1 C1 05B2 C2 05B3 C3 05B4 C4 05B5 C5 05B6 C6 05B7 C7 05B8 C8 05B9 C9 05BB CB 05BC CC 05BD CD 05BE CE 05BF CF 05C0 D0 05C1 D1 05C2 D2 05C3 D3 05D0 E0 05D1 E1 05D2 E2 05D3 E3 05D4 E4 05D5 E5 05D6 E6 05D7 E7 05D8 E8 05D9 E9 05DA EA 05DB EB 05DC EC 05DD ED 05DE EE 05DF EF 05E0 F0 05E1 F1 05E2 F2 05E3 F3 05E4 F4 05E5 F5 05E6 F6 05E7 F7 05E8 F8 05E9 F9 05EA FA 05F0 D4 05F1 D5 05F2 D6 05F3 D7 05F4 D8 200E FD 200F FE 2013 96 2014 97 2018 91 2019 92 201A 82 201C 93 201D 94 201E 84 2020 86 2021 87 2022 95 2026 85 2030 89 2039 8B 203A 9B 20AA A4 20AC 80 2122 99}
+} -result {}
+
+# cp1255 - invalid byte sequences
+lappend encInvalidBytes {*}{
+    cp1255 81 tcl8    \U00000081 -1 {} {}
+    cp1255 81 replace \uFFFD -1 {} {}
+    cp1255 81 strict  {}       0 {} {}
+    cp1255 8A tcl8    \U0000008A -1 {} {}
+    cp1255 8A replace \uFFFD -1 {} {}
+    cp1255 8A strict  {}       0 {} {}
+    cp1255 8C tcl8    \U0000008C -1 {} {}
+    cp1255 8C replace \uFFFD -1 {} {}
+    cp1255 8C strict  {}       0 {} {}
+    cp1255 8D tcl8    \U0000008D -1 {} {}
+    cp1255 8D replace \uFFFD -1 {} {}
+    cp1255 8D strict  {}       0 {} {}
+    cp1255 8E tcl8    \U0000008E -1 {} {}
+    cp1255 8E replace \uFFFD -1 {} {}
+    cp1255 8E strict  {}       0 {} {}
+    cp1255 8F tcl8    \U0000008F -1 {} {}
+    cp1255 8F replace \uFFFD -1 {} {}
+    cp1255 8F strict  {}       0 {} {}
+    cp1255 90 tcl8    \U00000090 -1 {} {}
+    cp1255 90 replace \uFFFD -1 {} {}
+    cp1255 90 strict  {}       0 {} {}
+    cp1255 9A tcl8    \U0000009A -1 {} {}
+    cp1255 9A replace \uFFFD -1 {} {}
+    cp1255 9A strict  {}       0 {} {}
+    cp1255 9C tcl8    \U0000009C -1 {} {}
+    cp1255 9C replace \uFFFD -1 {} {}
+    cp1255 9C strict  {}       0 {} {}
+    cp1255 9D tcl8    \U0000009D -1 {} {}
+    cp1255 9D replace \uFFFD -1 {} {}
+    cp1255 9D strict  {}       0 {} {}
+    cp1255 9E tcl8    \U0000009E -1 {} {}
+    cp1255 9E replace \uFFFD -1 {} {}
+    cp1255 9E strict  {}       0 {} {}
+    cp1255 9F tcl8    \U0000009F -1 {} {}
+    cp1255 9F replace \uFFFD -1 {} {}
+    cp1255 9F strict  {}       0 {} {}
+    cp1255 CA tcl8    \U000000CA -1 {} {}
+    cp1255 CA replace \uFFFD -1 {} {}
+    cp1255 CA strict  {}       0 {} {}
+    cp1255 D9 tcl8    \U000000D9 -1 {} {}
+    cp1255 D9 replace \uFFFD -1 {} {}
+    cp1255 D9 strict  {}       0 {} {}
+    cp1255 DA tcl8    \U000000DA -1 {} {}
+    cp1255 DA replace \uFFFD -1 {} {}
+    cp1255 DA strict  {}       0 {} {}
+    cp1255 DB tcl8    \U000000DB -1 {} {}
+    cp1255 DB replace \uFFFD -1 {} {}
+    cp1255 DB strict  {}       0 {} {}
+    cp1255 DC tcl8    \U000000DC -1 {} {}
+    cp1255 DC replace \uFFFD -1 {} {}
+    cp1255 DC strict  {}       0 {} {}
+    cp1255 DD tcl8    \U000000DD -1 {} {}
+    cp1255 DD replace \uFFFD -1 {} {}
+    cp1255 DD strict  {}       0 {} {}
+    cp1255 DE tcl8    \U000000DE -1 {} {}
+    cp1255 DE replace \uFFFD -1 {} {}
+    cp1255 DE strict  {}       0 {} {}
+    cp1255 DF tcl8    \U000000DF -1 {} {}
+    cp1255 DF replace \uFFFD -1 {} {}
+    cp1255 DF strict  {}       0 {} {}
+    cp1255 FB tcl8    \U000000FB -1 {} {}
+    cp1255 FB replace \uFFFD -1 {} {}
+    cp1255 FB strict  {}       0 {} {}
+    cp1255 FC tcl8    \U000000FC -1 {} {}
+    cp1255 FC replace \uFFFD -1 {} {}
+    cp1255 FC strict  {}       0 {} {}
+    cp1255 FF tcl8    \U000000FF -1 {} {}
+    cp1255 FF replace \uFFFD -1 {} {}
+    cp1255 FF strict  {}       0 {} {}
+}; # cp1255
+
+# cp1255 - invalid byte sequences
+lappend encUnencodableStrings {*}{
+    cp1255 \U00000080 tcl8    1A -1 {} {}
+    cp1255 \U00000080 replace 1A -1 {} {}
+    cp1255 \U00000080 strict  {}                      0 {} {}
+    cp1255 \U00000400 tcl8    1A -1 {} {}
+    cp1255 \U00000400 replace 1A -1 {} {}
+    cp1255 \U00000400 strict  {}                      0 {} {}
+    cp1255 \U0000D800 tcl8    1A -1 {} {}
+    cp1255 \U0000D800 replace 1A -1 {} {}
+    cp1255 \U0000D800 strict  {}                      0 {} {}
+    cp1255 \U0000DC00 tcl8    1A -1 {} {}
+    cp1255 \U0000DC00 replace 1A -1 {} {}
+    cp1255 \U0000DC00 strict  {}                      0 {} {}
+    cp1255 \U00010000 tcl8    1A -1 {} {}
+    cp1255 \U00010000 replace 1A -1 {} {}
+    cp1255 \U00010000 strict  {}                      0 {} {}
+    cp1255 \U0010FFFF tcl8    1A -1 {} {}
+    cp1255 \U0010FFFF replace 1A -1 {} {}
+    cp1255 \U0010FFFF strict  {}                      0 {} {}
+}; # cp1255
+
+#
+# cp1256 (generated from glibc-CP1256-2.1.2)
+
+test encoding-convertfrom-ucmCompare-cp1256 {Compare against ICU UCM} -body {
+    ucmConvertfromMismatches cp1256 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 00A0 A0 00A2 A2 00A3 A3 00A4 A4 00A5 A5 00A6 A6 00A7 A7 00A8 A8 00A9 A9 00AB AB 00AC AC 00AD AD 00AE AE 00AF AF 00B0 B0 00B1 B1 00B2 B2 00B3 B3 00B4 B4 00B5 B5 00B6 B6 00B7 B7 00B8 B8 00B9 B9 00BB BB 00BC BC 00BD BD 00BE BE 00D7 D7 00E0 E0 00E2 E2 00E7 E7 00E8 E8 00E9 E9 00EA EA 00EB EB 00EE EE 00EF EF 00F4 F4 00F7 F7 00F9 F9 00FB FB 00FC FC 0152 8C 0153 9C 0192 83 02C6 88 060C A1 061B BA 061F BF 0621 C1 0622 C2 0623 C3 0624 C4 0625 C5 0626 C6 0627 C7 0628 C8 0629 C9 062A CA 062B CB 062C CC 062D CD 062E CE 062F CF 0630 D0 0631 D1 0632 D2 0633 D3 0634 D4 0635 D5 0636 D6 0637 D8 0638 D9 0639 DA 063A DB 0640 DC 0641 DD 0642 DE 0643 DF 0644 E1 0645 E3 0646 E4 0647 E5 0648 E6 0649 EC 064A ED 064B F0 064C F1 064D F2 064E F3 064F F5 0650 F6 0651 F8 0652 FA 0679 8A 067E 81 0686 8D 0688 8F 0691 9A 0698 8E 06A9 98 06AF 90 06BA 9F 06BE AA 06C1 C0 06D2 FF 200C 9D 200D 9E 200E FD 200F FE 2013 96 2014 97 2018 91 2019 92 201A 82 201C 93 201D 94 201E 84 2020 86 2021 87 2022 95 2026 85 2030 89 2039 8B 203A 9B 20AC 80 2122 99}
+} -result {}
+
+test encoding-convertto-ucmCompare-cp1256 {Compare against ICU UCM} -body {
+    ucmConverttoMismatches cp1256 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 00A0 A0 00A2 A2 00A3 A3 00A4 A4 00A5 A5 00A6 A6 00A7 A7 00A8 A8 00A9 A9 00AB AB 00AC AC 00AD AD 00AE AE 00AF AF 00B0 B0 00B1 B1 00B2 B2 00B3 B3 00B4 B4 00B5 B5 00B6 B6 00B7 B7 00B8 B8 00B9 B9 00BB BB 00BC BC 00BD BD 00BE BE 00D7 D7 00E0 E0 00E2 E2 00E7 E7 00E8 E8 00E9 E9 00EA EA 00EB EB 00EE EE 00EF EF 00F4 F4 00F7 F7 00F9 F9 00FB FB 00FC FC 0152 8C 0153 9C 0192 83 02C6 88 060C A1 061B BA 061F BF 0621 C1 0622 C2 0623 C3 0624 C4 0625 C5 0626 C6 0627 C7 0628 C8 0629 C9 062A CA 062B CB 062C CC 062D CD 062E CE 062F CF 0630 D0 0631 D1 0632 D2 0633 D3 0634 D4 0635 D5 0636 D6 0637 D8 0638 D9 0639 DA 063A DB 0640 DC 0641 DD 0642 DE 0643 DF 0644 E1 0645 E3 0646 E4 0647 E5 0648 E6 0649 EC 064A ED 064B F0 064C F1 064D F2 064E F3 064F F5 0650 F6 0651 F8 0652 FA 0679 8A 067E 81 0686 8D 0688 8F 0691 9A 0698 8E 06A9 98 06AF 90 06BA 9F 06BE AA 06C1 C0 06D2 FF 200C 9D 200D 9E 200E FD 200F FE 2013 96 2014 97 2018 91 2019 92 201A 82 201C 93 201D 94 201E 84 2020 86 2021 87 2022 95 2026 85 2030 89 2039 8B 203A 9B 20AC 80 2122 99}
+} -result {}
+
+# cp1256 - invalid byte sequences
+lappend encInvalidBytes {*}{
+}; # cp1256
+
+# cp1256 - invalid byte sequences
+lappend encUnencodableStrings {*}{
+    cp1256 \U00000080 tcl8    1A -1 {} {}
+    cp1256 \U00000080 replace 1A -1 {} {}
+    cp1256 \U00000080 strict  {}                      0 {} {}
+    cp1256 \U00000400 tcl8    1A -1 {} {}
+    cp1256 \U00000400 replace 1A -1 {} {}
+    cp1256 \U00000400 strict  {}                      0 {} {}
+    cp1256 \U0000D800 tcl8    1A -1 {} {}
+    cp1256 \U0000D800 replace 1A -1 {} {}
+    cp1256 \U0000D800 strict  {}                      0 {} {}
+    cp1256 \U0000DC00 tcl8    1A -1 {} {}
+    cp1256 \U0000DC00 replace 1A -1 {} {}
+    cp1256 \U0000DC00 strict  {}                      0 {} {}
+    cp1256 \U00010000 tcl8    1A -1 {} {}
+    cp1256 \U00010000 replace 1A -1 {} {}
+    cp1256 \U00010000 strict  {}                      0 {} {}
+    cp1256 \U0010FFFF tcl8    1A -1 {} {}
+    cp1256 \U0010FFFF replace 1A -1 {} {}
+    cp1256 \U0010FFFF strict  {}                      0 {} {}
+}; # cp1256
+
+#
+# cp1257 (generated from glibc-CP1257-2.1.2)
+
+test encoding-convertfrom-ucmCompare-cp1257 {Compare against ICU UCM} -body {
+    ucmConvertfromMismatches cp1257 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 00A0 A0 00A2 A2 00A3 A3 00A4 A4 00A6 A6 00A7 A7 00A8 8D 00A9 A9 00AB AB 00AC AC 00AD AD 00AE AE 00AF 9D 00B0 B0 00B1 B1 00B2 B2 00B3 B3 00B4 B4 00B5 B5 00B6 B6 00B7 B7 00B8 8F 00B9 B9 00BB BB 00BC BC 00BD BD 00BE BE 00C4 C4 00C5 C5 00C6 AF 00C9 C9 00D3 D3 00D5 D5 00D6 D6 00D7 D7 00D8 A8 00DC DC 00DF DF 00E4 E4 00E5 E5 00E6 BF 00E9 E9 00F3 F3 00F5 F5 00F6 F6 00F7 F7 00F8 B8 00FC FC 0100 C2 0101 E2 0104 C0 0105 E0 0106 C3 0107 E3 010C C8 010D E8 0112 C7 0113 E7 0116 CB 0117 EB 0118 C6 0119 E6 0122 CC 0123 EC 012A CE 012B EE 012E C1 012F E1 0136 CD 0137 ED 013B CF 013C EF 0141 D9 0142 F9 0143 D1 0144 F1 0145 D2 0146 F2 014C D4 014D F4 0156 AA 0157 BA 015A DA 015B FA 0160 D0 0161 F0 016A DB 016B FB 0172 D8 0173 F8 0179 CA 017A EA 017B DD 017C FD 017D DE 017E FE 02C7 8E 02D9 FF 02DB 9E 2013 96 2014 97 2018 91 2019 92 201A 82 201C 93 201D 94 201E 84 2020 86 2021 87 2022 95 2026 85 2030 89 2039 8B 203A 9B 20AC 80 2122 99}
+} -result {}
+
+test encoding-convertto-ucmCompare-cp1257 {Compare against ICU UCM} -body {
+    ucmConverttoMismatches cp1257 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 00A0 A0 00A2 A2 00A3 A3 00A4 A4 00A6 A6 00A7 A7 00A8 8D 00A9 A9 00AB AB 00AC AC 00AD AD 00AE AE 00AF 9D 00B0 B0 00B1 B1 00B2 B2 00B3 B3 00B4 B4 00B5 B5 00B6 B6 00B7 B7 00B8 8F 00B9 B9 00BB BB 00BC BC 00BD BD 00BE BE 00C4 C4 00C5 C5 00C6 AF 00C9 C9 00D3 D3 00D5 D5 00D6 D6 00D7 D7 00D8 A8 00DC DC 00DF DF 00E4 E4 00E5 E5 00E6 BF 00E9 E9 00F3 F3 00F5 F5 00F6 F6 00F7 F7 00F8 B8 00FC FC 0100 C2 0101 E2 0104 C0 0105 E0 0106 C3 0107 E3 010C C8 010D E8 0112 C7 0113 E7 0116 CB 0117 EB 0118 C6 0119 E6 0122 CC 0123 EC 012A CE 012B EE 012E C1 012F E1 0136 CD 0137 ED 013B CF 013C EF 0141 D9 0142 F9 0143 D1 0144 F1 0145 D2 0146 F2 014C D4 014D F4 0156 AA 0157 BA 015A DA 015B FA 0160 D0 0161 F0 016A DB 016B FB 0172 D8 0173 F8 0179 CA 017A EA 017B DD 017C FD 017D DE 017E FE 02C7 8E 02D9 FF 02DB 9E 2013 96 2014 97 2018 91 2019 92 201A 82 201C 93 201D 94 201E 84 2020 86 2021 87 2022 95 2026 85 2030 89 2039 8B 203A 9B 20AC 80 2122 99}
+} -result {}
+
+# cp1257 - invalid byte sequences
+lappend encInvalidBytes {*}{
+    cp1257 81 tcl8    \U00000081 -1 {} {}
+    cp1257 81 replace \uFFFD -1 {} {}
+    cp1257 81 strict  {}       0 {} {}
+    cp1257 83 tcl8    \U00000083 -1 {} {}
+    cp1257 83 replace \uFFFD -1 {} {}
+    cp1257 83 strict  {}       0 {} {}
+    cp1257 88 tcl8    \U00000088 -1 {} {}
+    cp1257 88 replace \uFFFD -1 {} {}
+    cp1257 88 strict  {}       0 {} {}
+    cp1257 8A tcl8    \U0000008A -1 {} {}
+    cp1257 8A replace \uFFFD -1 {} {}
+    cp1257 8A strict  {}       0 {} {}
+    cp1257 8C tcl8    \U0000008C -1 {} {}
+    cp1257 8C replace \uFFFD -1 {} {}
+    cp1257 8C strict  {}       0 {} {}
+    cp1257 90 tcl8    \U00000090 -1 {} {}
+    cp1257 90 replace \uFFFD -1 {} {}
+    cp1257 90 strict  {}       0 {} {}
+    cp1257 98 tcl8    \U00000098 -1 {} {}
+    cp1257 98 replace \uFFFD -1 {} {}
+    cp1257 98 strict  {}       0 {} {}
+    cp1257 9A tcl8    \U0000009A -1 {} {}
+    cp1257 9A replace \uFFFD -1 {} {}
+    cp1257 9A strict  {}       0 {} {}
+    cp1257 9C tcl8    \U0000009C -1 {} {}
+    cp1257 9C replace \uFFFD -1 {} {}
+    cp1257 9C strict  {}       0 {} {}
+    cp1257 9F tcl8    \U0000009F -1 {} {}
+    cp1257 9F replace \uFFFD -1 {} {}
+    cp1257 9F strict  {}       0 {} {}
+    cp1257 A1 tcl8    \U000000A1 -1 {} {}
+    cp1257 A1 replace \uFFFD -1 {} {}
+    cp1257 A1 strict  {}       0 {} {}
+    cp1257 A5 tcl8    \U000000A5 -1 {} {}
+    cp1257 A5 replace \uFFFD -1 {} {}
+    cp1257 A5 strict  {}       0 {} {}
+}; # cp1257
+
+# cp1257 - invalid byte sequences
+lappend encUnencodableStrings {*}{
+    cp1257 \U00000080 tcl8    1A -1 {} {}
+    cp1257 \U00000080 replace 1A -1 {} {}
+    cp1257 \U00000080 strict  {}                      0 {} {}
+    cp1257 \U00000400 tcl8    1A -1 {} {}
+    cp1257 \U00000400 replace 1A -1 {} {}
+    cp1257 \U00000400 strict  {}                      0 {} {}
+    cp1257 \U0000D800 tcl8    1A -1 {} {}
+    cp1257 \U0000D800 replace 1A -1 {} {}
+    cp1257 \U0000D800 strict  {}                      0 {} {}
+    cp1257 \U0000DC00 tcl8    1A -1 {} {}
+    cp1257 \U0000DC00 replace 1A -1 {} {}
+    cp1257 \U0000DC00 strict  {}                      0 {} {}
+    cp1257 \U00010000 tcl8    1A -1 {} {}
+    cp1257 \U00010000 replace 1A -1 {} {}
+    cp1257 \U00010000 strict  {}                      0 {} {}
+    cp1257 \U0010FFFF tcl8    1A -1 {} {}
+    cp1257 \U0010FFFF replace 1A -1 {} {}
+    cp1257 \U0010FFFF strict  {}                      0 {} {}
+}; # cp1257
+
+#
+# cp1258 (generated from glibc-CP1258-2.1.2)
+
+test encoding-convertfrom-ucmCompare-cp1258 {Compare against ICU UCM} -body {
+    ucmConvertfromMismatches cp1258 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 00A0 A0 00A1 A1 00A2 A2 00A3 A3 00A4 A4 00A5 A5 00A6 A6 00A7 A7 00A8 A8 00A9 A9 00AA AA 00AB AB 00AC AC 00AD AD 00AE AE 00AF AF 00B0 B0 00B1 B1 00B2 B2 00B3 B3 00B4 B4 00B5 B5 00B6 B6 00B7 B7 00B8 B8 00B9 B9 00BA BA 00BB BB 00BC BC 00BD BD 00BE BE 00BF BF 00C0 C0 00C1 C1 00C2 C2 00C4 C4 00C5 C5 00C6 C6 00C7 C7 00C8 C8 00C9 C9 00CA CA 00CB CB 00CD CD 00CE CE 00CF CF 00D1 D1 00D3 D3 00D4 D4 00D6 D6 00D7 D7 00D8 D8 00D9 D9 00DA DA 00DB DB 00DC DC 00DF DF 00E0 E0 00E1 E1 00E2 E2 00E4 E4 00E5 E5 00E6 E6 00E7 E7 00E8 E8 00E9 E9 00EA EA 00EB EB 00ED ED 00EE EE 00EF EF 00F1 F1 00F3 F3 00F4 F4 00F6 F6 00F7 F7 00F8 F8 00F9 F9 00FA FA 00FB FB 00FC FC 00FF FF 0102 C3 0103 E3 0110 D0 0111 F0 0152 8C 0153 9C 0178 9F 0192 83 01A0 D5 01A1 F5 01AF DD 01B0 FD 02C6 88 02DC 98 0300 CC 0303 DE 0309 D2 0323 F2 2013 96 2014 97 2018 91 2019 92 201A 82 201C 93 201D 94 201E 84 2020 86 2021 87 2022 95 2026 85 2030 89 2039 8B 203A 9B 20AB FE 20AC 80 2122 99}
+} -result {}
+
+test encoding-convertto-ucmCompare-cp1258 {Compare against ICU UCM} -body {
+    ucmConverttoMismatches cp1258 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 00A0 A0 00A1 A1 00A2 A2 00A3 A3 00A4 A4 00A5 A5 00A6 A6 00A7 A7 00A8 A8 00A9 A9 00AA AA 00AB AB 00AC AC 00AD AD 00AE AE 00AF AF 00B0 B0 00B1 B1 00B2 B2 00B3 B3 00B4 B4 00B5 B5 00B6 B6 00B7 B7 00B8 B8 00B9 B9 00BA BA 00BB BB 00BC BC 00BD BD 00BE BE 00BF BF 00C0 C0 00C1 C1 00C2 C2 00C4 C4 00C5 C5 00C6 C6 00C7 C7 00C8 C8 00C9 C9 00CA CA 00CB CB 00CD CD 00CE CE 00CF CF 00D1 D1 00D3 D3 00D4 D4 00D6 D6 00D7 D7 00D8 D8 00D9 D9 00DA DA 00DB DB 00DC DC 00DF DF 00E0 E0 00E1 E1 00E2 E2 00E4 E4 00E5 E5 00E6 E6 00E7 E7 00E8 E8 00E9 E9 00EA EA 00EB EB 00ED ED 00EE EE 00EF EF 00F1 F1 00F3 F3 00F4 F4 00F6 F6 00F7 F7 00F8 F8 00F9 F9 00FA FA 00FB FB 00FC FC 00FF FF 0102 C3 0103 E3 0110 D0 0111 F0 0152 8C 0153 9C 0178 9F 0192 83 01A0 D5 01A1 F5 01AF DD 01B0 FD 02C6 88 02DC 98 0300 CC 0303 DE 0309 D2 0323 F2 2013 96 2014 97 2018 91 2019 92 201A 82 201C 93 201D 94 201E 84 2020 86 2021 87 2022 95 2026 85 2030 89 2039 8B 203A 9B 20AB FE 20AC 80 2122 99}
+} -result {}
+
+# cp1258 - invalid byte sequences
+lappend encInvalidBytes {*}{
+    cp1258 81 tcl8    \U00000081 -1 {} {}
+    cp1258 81 replace \uFFFD -1 {} {}
+    cp1258 81 strict  {}       0 {} {}
+    cp1258 8A tcl8    \U0000008A -1 {} {}
+    cp1258 8A replace \uFFFD -1 {} {}
+    cp1258 8A strict  {}       0 {} {}
+    cp1258 8D tcl8    \U0000008D -1 {} {}
+    cp1258 8D replace \uFFFD -1 {} {}
+    cp1258 8D strict  {}       0 {} {}
+    cp1258 8E tcl8    \U0000008E -1 {} {}
+    cp1258 8E replace \uFFFD -1 {} {}
+    cp1258 8E strict  {}       0 {} {}
+    cp1258 8F tcl8    \U0000008F -1 {} {}
+    cp1258 8F replace \uFFFD -1 {} {}
+    cp1258 8F strict  {}       0 {} {}
+    cp1258 90 tcl8    \U00000090 -1 {} {}
+    cp1258 90 replace \uFFFD -1 {} {}
+    cp1258 90 strict  {}       0 {} {}
+    cp1258 9A tcl8    \U0000009A -1 {} {}
+    cp1258 9A replace \uFFFD -1 {} {}
+    cp1258 9A strict  {}       0 {} {}
+    cp1258 9D tcl8    \U0000009D -1 {} {}
+    cp1258 9D replace \uFFFD -1 {} {}
+    cp1258 9D strict  {}       0 {} {}
+    cp1258 9E tcl8    \U0000009E -1 {} {}
+    cp1258 9E replace \uFFFD -1 {} {}
+    cp1258 9E strict  {}       0 {} {}
+    cp1258 EC tcl8    \U000000EC -1 {} {}
+    cp1258 EC replace \uFFFD -1 {} {}
+    cp1258 EC strict  {}       0 {} {}
+}; # cp1258
+
+# cp1258 - invalid byte sequences
+lappend encUnencodableStrings {*}{
+    cp1258 \U00000080 tcl8    1A -1 {} {}
+    cp1258 \U00000080 replace 1A -1 {} {}
+    cp1258 \U00000080 strict  {}                      0 {} {}
+    cp1258 \U00000400 tcl8    1A -1 {} {}
+    cp1258 \U00000400 replace 1A -1 {} {}
+    cp1258 \U00000400 strict  {}                      0 {} {}
+    cp1258 \U0000D800 tcl8    1A -1 {} {}
+    cp1258 \U0000D800 replace 1A -1 {} {}
+    cp1258 \U0000D800 strict  {}                      0 {} {}
+    cp1258 \U0000DC00 tcl8    1A -1 {} {}
+    cp1258 \U0000DC00 replace 1A -1 {} {}
+    cp1258 \U0000DC00 strict  {}                      0 {} {}
+    cp1258 \U00010000 tcl8    1A -1 {} {}
+    cp1258 \U00010000 replace 1A -1 {} {}
+    cp1258 \U00010000 strict  {}                      0 {} {}
+    cp1258 \U0010FFFF tcl8    1A -1 {} {}
+    cp1258 \U0010FFFF replace 1A -1 {} {}
+    cp1258 \U0010FFFF strict  {}                      0 {} {}
+}; # cp1258
+
+#
+# gb1988 (generated from glibc-GB_1988_80-2.3.3)
+
+test encoding-convertfrom-ucmCompare-gb1988 {Compare against ICU UCM} -body {
+    ucmConvertfromMismatches gb1988 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007F 7F 00A5 24 203E 7E}
+} -result {}
+
+test encoding-convertto-ucmCompare-gb1988 {Compare against ICU UCM} -body {
+    ucmConverttoMismatches gb1988 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007F 7F 00A5 24 203E 7E}
+} -result {}
+
+# gb1988 - invalid byte sequences
+lappend encInvalidBytes {*}{
+    gb1988 80 tcl8    \U00000080 -1 {} {}
+    gb1988 80 replace \uFFFD -1 {} {}
+    gb1988 80 strict  {}       0 {} {}
+    gb1988 81 tcl8    \U00000081 -1 {} {}
+    gb1988 81 replace \uFFFD -1 {} {}
+    gb1988 81 strict  {}       0 {} {}
+    gb1988 82 tcl8    \U00000082 -1 {} {}
+    gb1988 82 replace \uFFFD -1 {} {}
+    gb1988 82 strict  {}       0 {} {}
+    gb1988 83 tcl8    \U00000083 -1 {} {}
+    gb1988 83 replace \uFFFD -1 {} {}
+    gb1988 83 strict  {}       0 {} {}
+    gb1988 84 tcl8    \U00000084 -1 {} {}
+    gb1988 84 replace \uFFFD -1 {} {}
+    gb1988 84 strict  {}       0 {} {}
+    gb1988 85 tcl8    \U00000085 -1 {} {}
+    gb1988 85 replace \uFFFD -1 {} {}
+    gb1988 85 strict  {}       0 {} {}
+    gb1988 86 tcl8    \U00000086 -1 {} {}
+    gb1988 86 replace \uFFFD -1 {} {}
+    gb1988 86 strict  {}       0 {} {}
+    gb1988 87 tcl8    \U00000087 -1 {} {}
+    gb1988 87 replace \uFFFD -1 {} {}
+    gb1988 87 strict  {}       0 {} {}
+    gb1988 88 tcl8    \U00000088 -1 {} {}
+    gb1988 88 replace \uFFFD -1 {} {}
+    gb1988 88 strict  {}       0 {} {}
+    gb1988 89 tcl8    \U00000089 -1 {} {}
+    gb1988 89 replace \uFFFD -1 {} {}
+    gb1988 89 strict  {}       0 {} {}
+    gb1988 8A tcl8    \U0000008A -1 {} {}
+    gb1988 8A replace \uFFFD -1 {} {}
+    gb1988 8A strict  {}       0 {} {}
+    gb1988 8B tcl8    \U0000008B -1 {} {}
+    gb1988 8B replace \uFFFD -1 {} {}
+    gb1988 8B strict  {}       0 {} {}
+    gb1988 8C tcl8    \U0000008C -1 {} {}
+    gb1988 8C replace \uFFFD -1 {} {}
+    gb1988 8C strict  {}       0 {} {}
+    gb1988 8D tcl8    \U0000008D -1 {} {}
+    gb1988 8D replace \uFFFD -1 {} {}
+    gb1988 8D strict  {}       0 {} {}
+    gb1988 8E tcl8    \U0000008E -1 {} {}
+    gb1988 8E replace \uFFFD -1 {} {}
+    gb1988 8E strict  {}       0 {} {}
+    gb1988 8F tcl8    \U0000008F -1 {} {}
+    gb1988 8F replace \uFFFD -1 {} {}
+    gb1988 8F strict  {}       0 {} {}
+    gb1988 90 tcl8    \U00000090 -1 {} {}
+    gb1988 90 replace \uFFFD -1 {} {}
+    gb1988 90 strict  {}       0 {} {}
+    gb1988 91 tcl8    \U00000091 -1 {} {}
+    gb1988 91 replace \uFFFD -1 {} {}
+    gb1988 91 strict  {}       0 {} {}
+    gb1988 92 tcl8    \U00000092 -1 {} {}
+    gb1988 92 replace \uFFFD -1 {} {}
+    gb1988 92 strict  {}       0 {} {}
+    gb1988 93 tcl8    \U00000093 -1 {} {}
+    gb1988 93 replace \uFFFD -1 {} {}
+    gb1988 93 strict  {}       0 {} {}
+    gb1988 94 tcl8    \U00000094 -1 {} {}
+    gb1988 94 replace \uFFFD -1 {} {}
+    gb1988 94 strict  {}       0 {} {}
+    gb1988 95 tcl8    \U00000095 -1 {} {}
+    gb1988 95 replace \uFFFD -1 {} {}
+    gb1988 95 strict  {}       0 {} {}
+    gb1988 96 tcl8    \U00000096 -1 {} {}
+    gb1988 96 replace \uFFFD -1 {} {}
+    gb1988 96 strict  {}       0 {} {}
+    gb1988 97 tcl8    \U00000097 -1 {} {}
+    gb1988 97 replace \uFFFD -1 {} {}
+    gb1988 97 strict  {}       0 {} {}
+    gb1988 98 tcl8    \U00000098 -1 {} {}
+    gb1988 98 replace \uFFFD -1 {} {}
+    gb1988 98 strict  {}       0 {} {}
+    gb1988 99 tcl8    \U00000099 -1 {} {}
+    gb1988 99 replace \uFFFD -1 {} {}
+    gb1988 99 strict  {}       0 {} {}
+    gb1988 9A tcl8    \U0000009A -1 {} {}
+    gb1988 9A replace \uFFFD -1 {} {}
+    gb1988 9A strict  {}       0 {} {}
+    gb1988 9B tcl8    \U0000009B -1 {} {}
+    gb1988 9B replace \uFFFD -1 {} {}
+    gb1988 9B strict  {}       0 {} {}
+    gb1988 9C tcl8    \U0000009C -1 {} {}
+    gb1988 9C replace \uFFFD -1 {} {}
+    gb1988 9C strict  {}       0 {} {}
+    gb1988 9D tcl8    \U0000009D -1 {} {}
+    gb1988 9D replace \uFFFD -1 {} {}
+    gb1988 9D strict  {}       0 {} {}
+    gb1988 9E tcl8    \U0000009E -1 {} {}
+    gb1988 9E replace \uFFFD -1 {} {}
+    gb1988 9E strict  {}       0 {} {}
+    gb1988 9F tcl8    \U0000009F -1 {} {}
+    gb1988 9F replace \uFFFD -1 {} {}
+    gb1988 9F strict  {}       0 {} {}
+    gb1988 A0 tcl8    \U000000A0 -1 {} {}
+    gb1988 A0 replace \uFFFD -1 {} {}
+    gb1988 A0 strict  {}       0 {} {}
+    gb1988 A1 tcl8    \U000000A1 -1 {} {}
+    gb1988 A1 replace \uFFFD -1 {} {}
+    gb1988 A1 strict  {}       0 {} {}
+    gb1988 A2 tcl8    \U000000A2 -1 {} {}
+    gb1988 A2 replace \uFFFD -1 {} {}
+    gb1988 A2 strict  {}       0 {} {}
+    gb1988 A3 tcl8    \U000000A3 -1 {} {}
+    gb1988 A3 replace \uFFFD -1 {} {}
+    gb1988 A3 strict  {}       0 {} {}
+    gb1988 A4 tcl8    \U000000A4 -1 {} {}
+    gb1988 A4 replace \uFFFD -1 {} {}
+    gb1988 A4 strict  {}       0 {} {}
+    gb1988 A5 tcl8    \U000000A5 -1 {} {}
+    gb1988 A5 replace \uFFFD -1 {} {}
+    gb1988 A5 strict  {}       0 {} {}
+    gb1988 A6 tcl8    \U000000A6 -1 {} {}
+    gb1988 A6 replace \uFFFD -1 {} {}
+    gb1988 A6 strict  {}       0 {} {}
+    gb1988 A7 tcl8    \U000000A7 -1 {} {}
+    gb1988 A7 replace \uFFFD -1 {} {}
+    gb1988 A7 strict  {}       0 {} {}
+    gb1988 A8 tcl8    \U000000A8 -1 {} {}
+    gb1988 A8 replace \uFFFD -1 {} {}
+    gb1988 A8 strict  {}       0 {} {}
+    gb1988 A9 tcl8    \U000000A9 -1 {} {}
+    gb1988 A9 replace \uFFFD -1 {} {}
+    gb1988 A9 strict  {}       0 {} {}
+    gb1988 AA tcl8    \U000000AA -1 {} {}
+    gb1988 AA replace \uFFFD -1 {} {}
+    gb1988 AA strict  {}       0 {} {}
+    gb1988 AB tcl8    \U000000AB -1 {} {}
+    gb1988 AB replace \uFFFD -1 {} {}
+    gb1988 AB strict  {}       0 {} {}
+    gb1988 AC tcl8    \U000000AC -1 {} {}
+    gb1988 AC replace \uFFFD -1 {} {}
+    gb1988 AC strict  {}       0 {} {}
+    gb1988 AD tcl8    \U000000AD -1 {} {}
+    gb1988 AD replace \uFFFD -1 {} {}
+    gb1988 AD strict  {}       0 {} {}
+    gb1988 AE tcl8    \U000000AE -1 {} {}
+    gb1988 AE replace \uFFFD -1 {} {}
+    gb1988 AE strict  {}       0 {} {}
+    gb1988 AF tcl8    \U000000AF -1 {} {}
+    gb1988 AF replace \uFFFD -1 {} {}
+    gb1988 AF strict  {}       0 {} {}
+    gb1988 B0 tcl8    \U000000B0 -1 {} {}
+    gb1988 B0 replace \uFFFD -1 {} {}
+    gb1988 B0 strict  {}       0 {} {}
+    gb1988 B1 tcl8    \U000000B1 -1 {} {}
+    gb1988 B1 replace \uFFFD -1 {} {}
+    gb1988 B1 strict  {}       0 {} {}
+    gb1988 B2 tcl8    \U000000B2 -1 {} {}
+    gb1988 B2 replace \uFFFD -1 {} {}
+    gb1988 B2 strict  {}       0 {} {}
+    gb1988 B3 tcl8    \U000000B3 -1 {} {}
+    gb1988 B3 replace \uFFFD -1 {} {}
+    gb1988 B3 strict  {}       0 {} {}
+    gb1988 B4 tcl8    \U000000B4 -1 {} {}
+    gb1988 B4 replace \uFFFD -1 {} {}
+    gb1988 B4 strict  {}       0 {} {}
+    gb1988 B5 tcl8    \U000000B5 -1 {} {}
+    gb1988 B5 replace \uFFFD -1 {} {}
+    gb1988 B5 strict  {}       0 {} {}
+    gb1988 B6 tcl8    \U000000B6 -1 {} {}
+    gb1988 B6 replace \uFFFD -1 {} {}
+    gb1988 B6 strict  {}       0 {} {}
+    gb1988 B7 tcl8    \U000000B7 -1 {} {}
+    gb1988 B7 replace \uFFFD -1 {} {}
+    gb1988 B7 strict  {}       0 {} {}
+    gb1988 B8 tcl8    \U000000B8 -1 {} {}
+    gb1988 B8 replace \uFFFD -1 {} {}
+    gb1988 B8 strict  {}       0 {} {}
+    gb1988 B9 tcl8    \U000000B9 -1 {} {}
+    gb1988 B9 replace \uFFFD -1 {} {}
+    gb1988 B9 strict  {}       0 {} {}
+    gb1988 BA tcl8    \U000000BA -1 {} {}
+    gb1988 BA replace \uFFFD -1 {} {}
+    gb1988 BA strict  {}       0 {} {}
+    gb1988 BB tcl8    \U000000BB -1 {} {}
+    gb1988 BB replace \uFFFD -1 {} {}
+    gb1988 BB strict  {}       0 {} {}
+    gb1988 BC tcl8    \U000000BC -1 {} {}
+    gb1988 BC replace \uFFFD -1 {} {}
+    gb1988 BC strict  {}       0 {} {}
+    gb1988 BD tcl8    \U000000BD -1 {} {}
+    gb1988 BD replace \uFFFD -1 {} {}
+    gb1988 BD strict  {}       0 {} {}
+    gb1988 BE tcl8    \U000000BE -1 {} {}
+    gb1988 BE replace \uFFFD -1 {} {}
+    gb1988 BE strict  {}       0 {} {}
+    gb1988 BF tcl8    \U000000BF -1 {} {}
+    gb1988 BF replace \uFFFD -1 {} {}
+    gb1988 BF strict  {}       0 {} {}
+    gb1988 C0 tcl8    \U000000C0 -1 {} {}
+    gb1988 C0 replace \uFFFD -1 {} {}
+    gb1988 C0 strict  {}       0 {} {}
+    gb1988 C1 tcl8    \U000000C1 -1 {} {}
+    gb1988 C1 replace \uFFFD -1 {} {}
+    gb1988 C1 strict  {}       0 {} {}
+    gb1988 C2 tcl8    \U000000C2 -1 {} {}
+    gb1988 C2 replace \uFFFD -1 {} {}
+    gb1988 C2 strict  {}       0 {} {}
+    gb1988 C3 tcl8    \U000000C3 -1 {} {}
+    gb1988 C3 replace \uFFFD -1 {} {}
+    gb1988 C3 strict  {}       0 {} {}
+    gb1988 C4 tcl8    \U000000C4 -1 {} {}
+    gb1988 C4 replace \uFFFD -1 {} {}
+    gb1988 C4 strict  {}       0 {} {}
+    gb1988 C5 tcl8    \U000000C5 -1 {} {}
+    gb1988 C5 replace \uFFFD -1 {} {}
+    gb1988 C5 strict  {}       0 {} {}
+    gb1988 C6 tcl8    \U000000C6 -1 {} {}
+    gb1988 C6 replace \uFFFD -1 {} {}
+    gb1988 C6 strict  {}       0 {} {}
+    gb1988 C7 tcl8    \U000000C7 -1 {} {}
+    gb1988 C7 replace \uFFFD -1 {} {}
+    gb1988 C7 strict  {}       0 {} {}
+    gb1988 C8 tcl8    \U000000C8 -1 {} {}
+    gb1988 C8 replace \uFFFD -1 {} {}
+    gb1988 C8 strict  {}       0 {} {}
+    gb1988 C9 tcl8    \U000000C9 -1 {} {}
+    gb1988 C9 replace \uFFFD -1 {} {}
+    gb1988 C9 strict  {}       0 {} {}
+    gb1988 CA tcl8    \U000000CA -1 {} {}
+    gb1988 CA replace \uFFFD -1 {} {}
+    gb1988 CA strict  {}       0 {} {}
+    gb1988 CB tcl8    \U000000CB -1 {} {}
+    gb1988 CB replace \uFFFD -1 {} {}
+    gb1988 CB strict  {}       0 {} {}
+    gb1988 CC tcl8    \U000000CC -1 {} {}
+    gb1988 CC replace \uFFFD -1 {} {}
+    gb1988 CC strict  {}       0 {} {}
+    gb1988 CD tcl8    \U000000CD -1 {} {}
+    gb1988 CD replace \uFFFD -1 {} {}
+    gb1988 CD strict  {}       0 {} {}
+    gb1988 CE tcl8    \U000000CE -1 {} {}
+    gb1988 CE replace \uFFFD -1 {} {}
+    gb1988 CE strict  {}       0 {} {}
+    gb1988 CF tcl8    \U000000CF -1 {} {}
+    gb1988 CF replace \uFFFD -1 {} {}
+    gb1988 CF strict  {}       0 {} {}
+    gb1988 D0 tcl8    \U000000D0 -1 {} {}
+    gb1988 D0 replace \uFFFD -1 {} {}
+    gb1988 D0 strict  {}       0 {} {}
+    gb1988 D1 tcl8    \U000000D1 -1 {} {}
+    gb1988 D1 replace \uFFFD -1 {} {}
+    gb1988 D1 strict  {}       0 {} {}
+    gb1988 D2 tcl8    \U000000D2 -1 {} {}
+    gb1988 D2 replace \uFFFD -1 {} {}
+    gb1988 D2 strict  {}       0 {} {}
+    gb1988 D3 tcl8    \U000000D3 -1 {} {}
+    gb1988 D3 replace \uFFFD -1 {} {}
+    gb1988 D3 strict  {}       0 {} {}
+    gb1988 D4 tcl8    \U000000D4 -1 {} {}
+    gb1988 D4 replace \uFFFD -1 {} {}
+    gb1988 D4 strict  {}       0 {} {}
+    gb1988 D5 tcl8    \U000000D5 -1 {} {}
+    gb1988 D5 replace \uFFFD -1 {} {}
+    gb1988 D5 strict  {}       0 {} {}
+    gb1988 D6 tcl8    \U000000D6 -1 {} {}
+    gb1988 D6 replace \uFFFD -1 {} {}
+    gb1988 D6 strict  {}       0 {} {}
+    gb1988 D7 tcl8    \U000000D7 -1 {} {}
+    gb1988 D7 replace \uFFFD -1 {} {}
+    gb1988 D7 strict  {}       0 {} {}
+    gb1988 D8 tcl8    \U000000D8 -1 {} {}
+    gb1988 D8 replace \uFFFD -1 {} {}
+    gb1988 D8 strict  {}       0 {} {}
+    gb1988 D9 tcl8    \U000000D9 -1 {} {}
+    gb1988 D9 replace \uFFFD -1 {} {}
+    gb1988 D9 strict  {}       0 {} {}
+    gb1988 DA tcl8    \U000000DA -1 {} {}
+    gb1988 DA replace \uFFFD -1 {} {}
+    gb1988 DA strict  {}       0 {} {}
+    gb1988 DB tcl8    \U000000DB -1 {} {}
+    gb1988 DB replace \uFFFD -1 {} {}
+    gb1988 DB strict  {}       0 {} {}
+    gb1988 DC tcl8    \U000000DC -1 {} {}
+    gb1988 DC replace \uFFFD -1 {} {}
+    gb1988 DC strict  {}       0 {} {}
+    gb1988 DD tcl8    \U000000DD -1 {} {}
+    gb1988 DD replace \uFFFD -1 {} {}
+    gb1988 DD strict  {}       0 {} {}
+    gb1988 DE tcl8    \U000000DE -1 {} {}
+    gb1988 DE replace \uFFFD -1 {} {}
+    gb1988 DE strict  {}       0 {} {}
+    gb1988 DF tcl8    \U000000DF -1 {} {}
+    gb1988 DF replace \uFFFD -1 {} {}
+    gb1988 DF strict  {}       0 {} {}
+    gb1988 E0 tcl8    \U000000E0 -1 {} {}
+    gb1988 E0 replace \uFFFD -1 {} {}
+    gb1988 E0 strict  {}       0 {} {}
+    gb1988 E1 tcl8    \U000000E1 -1 {} {}
+    gb1988 E1 replace \uFFFD -1 {} {}
+    gb1988 E1 strict  {}       0 {} {}
+    gb1988 E2 tcl8    \U000000E2 -1 {} {}
+    gb1988 E2 replace \uFFFD -1 {} {}
+    gb1988 E2 strict  {}       0 {} {}
+    gb1988 E3 tcl8    \U000000E3 -1 {} {}
+    gb1988 E3 replace \uFFFD -1 {} {}
+    gb1988 E3 strict  {}       0 {} {}
+    gb1988 E4 tcl8    \U000000E4 -1 {} {}
+    gb1988 E4 replace \uFFFD -1 {} {}
+    gb1988 E4 strict  {}       0 {} {}
+    gb1988 E5 tcl8    \U000000E5 -1 {} {}
+    gb1988 E5 replace \uFFFD -1 {} {}
+    gb1988 E5 strict  {}       0 {} {}
+    gb1988 E6 tcl8    \U000000E6 -1 {} {}
+    gb1988 E6 replace \uFFFD -1 {} {}
+    gb1988 E6 strict  {}       0 {} {}
+    gb1988 E7 tcl8    \U000000E7 -1 {} {}
+    gb1988 E7 replace \uFFFD -1 {} {}
+    gb1988 E7 strict  {}       0 {} {}
+    gb1988 E8 tcl8    \U000000E8 -1 {} {}
+    gb1988 E8 replace \uFFFD -1 {} {}
+    gb1988 E8 strict  {}       0 {} {}
+    gb1988 E9 tcl8    \U000000E9 -1 {} {}
+    gb1988 E9 replace \uFFFD -1 {} {}
+    gb1988 E9 strict  {}       0 {} {}
+    gb1988 EA tcl8    \U000000EA -1 {} {}
+    gb1988 EA replace \uFFFD -1 {} {}
+    gb1988 EA strict  {}       0 {} {}
+    gb1988 EB tcl8    \U000000EB -1 {} {}
+    gb1988 EB replace \uFFFD -1 {} {}
+    gb1988 EB strict  {}       0 {} {}
+    gb1988 EC tcl8    \U000000EC -1 {} {}
+    gb1988 EC replace \uFFFD -1 {} {}
+    gb1988 EC strict  {}       0 {} {}
+    gb1988 ED tcl8    \U000000ED -1 {} {}
+    gb1988 ED replace \uFFFD -1 {} {}
+    gb1988 ED strict  {}       0 {} {}
+    gb1988 EE tcl8    \U000000EE -1 {} {}
+    gb1988 EE replace \uFFFD -1 {} {}
+    gb1988 EE strict  {}       0 {} {}
+    gb1988 EF tcl8    \U000000EF -1 {} {}
+    gb1988 EF replace \uFFFD -1 {} {}
+    gb1988 EF strict  {}       0 {} {}
+    gb1988 F0 tcl8    \U000000F0 -1 {} {}
+    gb1988 F0 replace \uFFFD -1 {} {}
+    gb1988 F0 strict  {}       0 {} {}
+    gb1988 F1 tcl8    \U000000F1 -1 {} {}
+    gb1988 F1 replace \uFFFD -1 {} {}
+    gb1988 F1 strict  {}       0 {} {}
+    gb1988 F2 tcl8    \U000000F2 -1 {} {}
+    gb1988 F2 replace \uFFFD -1 {} {}
+    gb1988 F2 strict  {}       0 {} {}
+    gb1988 F3 tcl8    \U000000F3 -1 {} {}
+    gb1988 F3 replace \uFFFD -1 {} {}
+    gb1988 F3 strict  {}       0 {} {}
+    gb1988 F4 tcl8    \U000000F4 -1 {} {}
+    gb1988 F4 replace \uFFFD -1 {} {}
+    gb1988 F4 strict  {}       0 {} {}
+    gb1988 F5 tcl8    \U000000F5 -1 {} {}
+    gb1988 F5 replace \uFFFD -1 {} {}
+    gb1988 F5 strict  {}       0 {} {}
+    gb1988 F6 tcl8    \U000000F6 -1 {} {}
+    gb1988 F6 replace \uFFFD -1 {} {}
+    gb1988 F6 strict  {}       0 {} {}
+    gb1988 F7 tcl8    \U000000F7 -1 {} {}
+    gb1988 F7 replace \uFFFD -1 {} {}
+    gb1988 F7 strict  {}       0 {} {}
+    gb1988 F8 tcl8    \U000000F8 -1 {} {}
+    gb1988 F8 replace \uFFFD -1 {} {}
+    gb1988 F8 strict  {}       0 {} {}
+    gb1988 F9 tcl8    \U000000F9 -1 {} {}
+    gb1988 F9 replace \uFFFD -1 {} {}
+    gb1988 F9 strict  {}       0 {} {}
+    gb1988 FA tcl8    \U000000FA -1 {} {}
+    gb1988 FA replace \uFFFD -1 {} {}
+    gb1988 FA strict  {}       0 {} {}
+    gb1988 FB tcl8    \U000000FB -1 {} {}
+    gb1988 FB replace \uFFFD -1 {} {}
+    gb1988 FB strict  {}       0 {} {}
+    gb1988 FC tcl8    \U000000FC -1 {} {}
+    gb1988 FC replace \uFFFD -1 {} {}
+    gb1988 FC strict  {}       0 {} {}
+    gb1988 FD tcl8    \U000000FD -1 {} {}
+    gb1988 FD replace \uFFFD -1 {} {}
+    gb1988 FD strict  {}       0 {} {}
+    gb1988 FE tcl8    \U000000FE -1 {} {}
+    gb1988 FE replace \uFFFD -1 {} {}
+    gb1988 FE strict  {}       0 {} {}
+    gb1988 FF tcl8    \U000000FF -1 {} {}
+    gb1988 FF replace \uFFFD -1 {} {}
+    gb1988 FF strict  {}       0 {} {}
+}; # gb1988
+
+# gb1988 - invalid byte sequences
+lappend encUnencodableStrings {*}{
+    gb1988 \U00000024 tcl8    1A -1 {} {}
+    gb1988 \U00000024 replace 1A -1 {} {}
+    gb1988 \U00000024 strict  {}                      0 {} {}
+    gb1988 \U00000400 tcl8    1A -1 {} {}
+    gb1988 \U00000400 replace 1A -1 {} {}
+    gb1988 \U00000400 strict  {}                      0 {} {}
+    gb1988 \U0000D800 tcl8    1A -1 {} {}
+    gb1988 \U0000D800 replace 1A -1 {} {}
+    gb1988 \U0000D800 strict  {}                      0 {} {}
+    gb1988 \U0000DC00 tcl8    1A -1 {} {}
+    gb1988 \U0000DC00 replace 1A -1 {} {}
+    gb1988 \U0000DC00 strict  {}                      0 {} {}
+    gb1988 \U00010000 tcl8    1A -1 {} {}
+    gb1988 \U00010000 replace 1A -1 {} {}
+    gb1988 \U00010000 strict  {}                      0 {} {}
+    gb1988 \U0010FFFF tcl8    1A -1 {} {}
+    gb1988 \U0010FFFF replace 1A -1 {} {}
+    gb1988 \U0010FFFF strict  {}                      0 {} {}
+}; # gb1988
+
+#
+# iso8859-1 (generated from glibc-ISO_8859_1-2.1.2)
+
+test encoding-convertfrom-ucmCompare-iso8859-1 {Compare against ICU UCM} -body {
+    ucmConvertfromMismatches iso8859-1 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A1 A1 00A2 A2 00A3 A3 00A4 A4 00A5 A5 00A6 A6 00A7 A7 00A8 A8 00A9 A9 00AA AA 00AB AB 00AC AC 00AD AD 00AE AE 00AF AF 00B0 B0 00B1 B1 00B2 B2 00B3 B3 00B4 B4 00B5 B5 00B6 B6 00B7 B7 00B8 B8 00B9 B9 00BA BA 00BB BB 00BC BC 00BD BD 00BE BE 00BF BF 00C0 C0 00C1 C1 00C2 C2 00C3 C3 00C4 C4 00C5 C5 00C6 C6 00C7 C7 00C8 C8 00C9 C9 00CA CA 00CB CB 00CC CC 00CD CD 00CE CE 00CF CF 00D0 D0 00D1 D1 00D2 D2 00D3 D3 00D4 D4 00D5 D5 00D6 D6 00D7 D7 00D8 D8 00D9 D9 00DA DA 00DB DB 00DC DC 00DD DD 00DE DE 00DF DF 00E0 E0 00E1 E1 00E2 E2 00E3 E3 00E4 E4 00E5 E5 00E6 E6 00E7 E7 00E8 E8 00E9 E9 00EA EA 00EB EB 00EC EC 00ED ED 00EE EE 00EF EF 00F0 F0 00F1 F1 00F2 F2 00F3 F3 00F4 F4 00F5 F5 00F6 F6 00F7 F7 00F8 F8 00F9 F9 00FA FA 00FB FB 00FC FC 00FD FD 00FE FE 00FF FF}
+} -result {}
+
+test encoding-convertto-ucmCompare-iso8859-1 {Compare against ICU UCM} -body {
+    ucmConverttoMismatches iso8859-1 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A1 A1 00A2 A2 00A3 A3 00A4 A4 00A5 A5 00A6 A6 00A7 A7 00A8 A8 00A9 A9 00AA AA 00AB AB 00AC AC 00AD AD 00AE AE 00AF AF 00B0 B0 00B1 B1 00B2 B2 00B3 B3 00B4 B4 00B5 B5 00B6 B6 00B7 B7 00B8 B8 00B9 B9 00BA BA 00BB BB 00BC BC 00BD BD 00BE BE 00BF BF 00C0 C0 00C1 C1 00C2 C2 00C3 C3 00C4 C4 00C5 C5 00C6 C6 00C7 C7 00C8 C8 00C9 C9 00CA CA 00CB CB 00CC CC 00CD CD 00CE CE 00CF CF 00D0 D0 00D1 D1 00D2 D2 00D3 D3 00D4 D4 00D5 D5 00D6 D6 00D7 D7 00D8 D8 00D9 D9 00DA DA 00DB DB 00DC DC 00DD DD 00DE DE 00DF DF 00E0 E0 00E1 E1 00E2 E2 00E3 E3 00E4 E4 00E5 E5 00E6 E6 00E7 E7 00E8 E8 00E9 E9 00EA EA 00EB EB 00EC EC 00ED ED 00EE EE 00EF EF 00F0 F0 00F1 F1 00F2 F2 00F3 F3 00F4 F4 00F5 F5 00F6 F6 00F7 F7 00F8 F8 00F9 F9 00FA FA 00FB FB 00FC FC 00FD FD 00FE FE 00FF FF}
+} -result {}
+
+# iso8859-1 - invalid byte sequences
+lappend encInvalidBytes {*}{
+}; # iso8859-1
+
+# iso8859-1 - invalid byte sequences
+lappend encUnencodableStrings {*}{
+    iso8859-1 \U00000400 tcl8    1A -1 {} {}
+    iso8859-1 \U00000400 replace 1A -1 {} {}
+    iso8859-1 \U00000400 strict  {}                      0 {} {}
+    iso8859-1 \U0000D800 tcl8    1A -1 {} {}
+    iso8859-1 \U0000D800 replace 1A -1 {} {}
+    iso8859-1 \U0000D800 strict  {}                      0 {} {}
+    iso8859-1 \U0000DC00 tcl8    1A -1 {} {}
+    iso8859-1 \U0000DC00 replace 1A -1 {} {}
+    iso8859-1 \U0000DC00 strict  {}                      0 {} {}
+    iso8859-1 \U00010000 tcl8    1A -1 {} {}
+    iso8859-1 \U00010000 replace 1A -1 {} {}
+    iso8859-1 \U00010000 strict  {}                      0 {} {}
+    iso8859-1 \U0010FFFF tcl8    1A -1 {} {}
+    iso8859-1 \U0010FFFF replace 1A -1 {} {}
+    iso8859-1 \U0010FFFF strict  {}                      0 {} {}
+}; # iso8859-1
+
+#
+# iso8859-2 (generated from glibc-ISO_8859_2-2.1.2)
+
+test encoding-convertfrom-ucmCompare-iso8859-2 {Compare against ICU UCM} -body {
+    ucmConvertfromMismatches iso8859-2 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A4 A4 00A7 A7 00A8 A8 00AD AD 00B0 B0 00B4 B4 00B8 B8 00C1 C1 00C2 C2 00C4 C4 00C7 C7 00C9 C9 00CB CB 00CD CD 00CE CE 00D3 D3 00D4 D4 00D6 D6 00D7 D7 00DA DA 00DC DC 00DD DD 00DF DF 00E1 E1 00E2 E2 00E4 E4 00E7 E7 00E9 E9 00EB EB 00ED ED 00EE EE 00F3 F3 00F4 F4 00F6 F6 00F7 F7 00FA FA 00FC FC 00FD FD 0102 C3 0103 E3 0104 A1 0105 B1 0106 C6 0107 E6 010C C8 010D E8 010E CF 010F EF 0110 D0 0111 F0 0118 CA 0119 EA 011A CC 011B EC 0139 C5 013A E5 013D A5 013E B5 0141 A3 0142 B3 0143 D1 0144 F1 0147 D2 0148 F2 0150 D5 0151 F5 0154 C0 0155 E0 0158 D8 0159 F8 015A A6 015B B6 015E AA 015F BA 0160 A9 0161 B9 0162 DE 0163 FE 0164 AB 0165 BB 016E D9 016F F9 0170 DB 0171 FB 0179 AC 017A BC 017B AF 017C BF 017D AE 017E BE 02C7 B7 02D8 A2 02D9 FF 02DB B2 02DD BD}
+} -result {}
+
+test encoding-convertto-ucmCompare-iso8859-2 {Compare against ICU UCM} -body {
+    ucmConverttoMismatches iso8859-2 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A4 A4 00A7 A7 00A8 A8 00AD AD 00B0 B0 00B4 B4 00B8 B8 00C1 C1 00C2 C2 00C4 C4 00C7 C7 00C9 C9 00CB CB 00CD CD 00CE CE 00D3 D3 00D4 D4 00D6 D6 00D7 D7 00DA DA 00DC DC 00DD DD 00DF DF 00E1 E1 00E2 E2 00E4 E4 00E7 E7 00E9 E9 00EB EB 00ED ED 00EE EE 00F3 F3 00F4 F4 00F6 F6 00F7 F7 00FA FA 00FC FC 00FD FD 0102 C3 0103 E3 0104 A1 0105 B1 0106 C6 0107 E6 010C C8 010D E8 010E CF 010F EF 0110 D0 0111 F0 0118 CA 0119 EA 011A CC 011B EC 0139 C5 013A E5 013D A5 013E B5 0141 A3 0142 B3 0143 D1 0144 F1 0147 D2 0148 F2 0150 D5 0151 F5 0154 C0 0155 E0 0158 D8 0159 F8 015A A6 015B B6 015E AA 015F BA 0160 A9 0161 B9 0162 DE 0163 FE 0164 AB 0165 BB 016E D9 016F F9 0170 DB 0171 FB 0179 AC 017A BC 017B AF 017C BF 017D AE 017E BE 02C7 B7 02D8 A2 02D9 FF 02DB B2 02DD BD}
+} -result {}
+
+# iso8859-2 - invalid byte sequences
+lappend encInvalidBytes {*}{
+}; # iso8859-2
+
+# iso8859-2 - invalid byte sequences
+lappend encUnencodableStrings {*}{
+    iso8859-2 \U000000A1 tcl8    1A -1 {} {}
+    iso8859-2 \U000000A1 replace 1A -1 {} {}
+    iso8859-2 \U000000A1 strict  {}                      0 {} {}
+    iso8859-2 \U00000400 tcl8    1A -1 {} {}
+    iso8859-2 \U00000400 replace 1A -1 {} {}
+    iso8859-2 \U00000400 strict  {}                      0 {} {}
+    iso8859-2 \U0000D800 tcl8    1A -1 {} {}
+    iso8859-2 \U0000D800 replace 1A -1 {} {}
+    iso8859-2 \U0000D800 strict  {}                      0 {} {}
+    iso8859-2 \U0000DC00 tcl8    1A -1 {} {}
+    iso8859-2 \U0000DC00 replace 1A -1 {} {}
+    iso8859-2 \U0000DC00 strict  {}                      0 {} {}
+    iso8859-2 \U00010000 tcl8    1A -1 {} {}
+    iso8859-2 \U00010000 replace 1A -1 {} {}
+    iso8859-2 \U00010000 strict  {}                      0 {} {}
+    iso8859-2 \U0010FFFF tcl8    1A -1 {} {}
+    iso8859-2 \U0010FFFF replace 1A -1 {} {}
+    iso8859-2 \U0010FFFF strict  {}                      0 {} {}
+}; # iso8859-2
+
+#
+# iso8859-3 (generated from glibc-ISO_8859_3-2.1.2)
+
+test encoding-convertfrom-ucmCompare-iso8859-3 {Compare against ICU UCM} -body {
+    ucmConvertfromMismatches iso8859-3 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A3 A3 00A4 A4 00A7 A7 00A8 A8 00AD AD 00B0 B0 00B2 B2 00B3 B3 00B4 B4 00B5 B5 00B7 B7 00B8 B8 00BD BD 00C0 C0 00C1 C1 00C2 C2 00C4 C4 00C7 C7 00C8 C8 00C9 C9 00CA CA 00CB CB 00CC CC 00CD CD 00CE CE 00CF CF 00D1 D1 00D2 D2 00D3 D3 00D4 D4 00D6 D6 00D7 D7 00D9 D9 00DA DA 00DB DB 00DC DC 00DF DF 00E0 E0 00E1 E1 00E2 E2 00E4 E4 00E7 E7 00E8 E8 00E9 E9 00EA EA 00EB EB 00EC EC 00ED ED 00EE EE 00EF EF 00F1 F1 00F2 F2 00F3 F3 00F4 F4 00F6 F6 00F7 F7 00F9 F9 00FA FA 00FB FB 00FC FC 0108 C6 0109 E6 010A C5 010B E5 011C D8 011D F8 011E AB 011F BB 0120 D5 0121 F5 0124 A6 0125 B6 0126 A1 0127 B1 0130 A9 0131 B9 0134 AC 0135 BC 015C DE 015D FE 015E AA 015F BA 016C DD 016D FD 017B AF 017C BF 02D8 A2 02D9 FF}
+} -result {}
+
+test encoding-convertto-ucmCompare-iso8859-3 {Compare against ICU UCM} -body {
+    ucmConverttoMismatches iso8859-3 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A3 A3 00A4 A4 00A7 A7 00A8 A8 00AD AD 00B0 B0 00B2 B2 00B3 B3 00B4 B4 00B5 B5 00B7 B7 00B8 B8 00BD BD 00C0 C0 00C1 C1 00C2 C2 00C4 C4 00C7 C7 00C8 C8 00C9 C9 00CA CA 00CB CB 00CC CC 00CD CD 00CE CE 00CF CF 00D1 D1 00D2 D2 00D3 D3 00D4 D4 00D6 D6 00D7 D7 00D9 D9 00DA DA 00DB DB 00DC DC 00DF DF 00E0 E0 00E1 E1 00E2 E2 00E4 E4 00E7 E7 00E8 E8 00E9 E9 00EA EA 00EB EB 00EC EC 00ED ED 00EE EE 00EF EF 00F1 F1 00F2 F2 00F3 F3 00F4 F4 00F6 F6 00F7 F7 00F9 F9 00FA FA 00FB FB 00FC FC 0108 C6 0109 E6 010A C5 010B E5 011C D8 011D F8 011E AB 011F BB 0120 D5 0121 F5 0124 A6 0125 B6 0126 A1 0127 B1 0130 A9 0131 B9 0134 AC 0135 BC 015C DE 015D FE 015E AA 015F BA 016C DD 016D FD 017B AF 017C BF 02D8 A2 02D9 FF}
+} -result {}
+
+# iso8859-3 - invalid byte sequences
+lappend encInvalidBytes {*}{
+    iso8859-3 A5 tcl8    \U000000A5 -1 {} {}
+    iso8859-3 A5 replace \uFFFD -1 {} {}
+    iso8859-3 A5 strict  {}       0 {} {}
+    iso8859-3 AE tcl8    \U000000AE -1 {} {}
+    iso8859-3 AE replace \uFFFD -1 {} {}
+    iso8859-3 AE strict  {}       0 {} {}
+    iso8859-3 BE tcl8    \U000000BE -1 {} {}
+    iso8859-3 BE replace \uFFFD -1 {} {}
+    iso8859-3 BE strict  {}       0 {} {}
+    iso8859-3 C3 tcl8    \U000000C3 -1 {} {}
+    iso8859-3 C3 replace \uFFFD -1 {} {}
+    iso8859-3 C3 strict  {}       0 {} {}
+    iso8859-3 D0 tcl8    \U000000D0 -1 {} {}
+    iso8859-3 D0 replace \uFFFD -1 {} {}
+    iso8859-3 D0 strict  {}       0 {} {}
+    iso8859-3 E3 tcl8    \U000000E3 -1 {} {}
+    iso8859-3 E3 replace \uFFFD -1 {} {}
+    iso8859-3 E3 strict  {}       0 {} {}
+    iso8859-3 F0 tcl8    \U000000F0 -1 {} {}
+    iso8859-3 F0 replace \uFFFD -1 {} {}
+    iso8859-3 F0 strict  {}       0 {} {}
+}; # iso8859-3
+
+# iso8859-3 - invalid byte sequences
+lappend encUnencodableStrings {*}{
+    iso8859-3 \U000000A1 tcl8    1A -1 {} {}
+    iso8859-3 \U000000A1 replace 1A -1 {} {}
+    iso8859-3 \U000000A1 strict  {}                      0 {} {}
+    iso8859-3 \U00000400 tcl8    1A -1 {} {}
+    iso8859-3 \U00000400 replace 1A -1 {} {}
+    iso8859-3 \U00000400 strict  {}                      0 {} {}
+    iso8859-3 \U0000D800 tcl8    1A -1 {} {}
+    iso8859-3 \U0000D800 replace 1A -1 {} {}
+    iso8859-3 \U0000D800 strict  {}                      0 {} {}
+    iso8859-3 \U0000DC00 tcl8    1A -1 {} {}
+    iso8859-3 \U0000DC00 replace 1A -1 {} {}
+    iso8859-3 \U0000DC00 strict  {}                      0 {} {}
+    iso8859-3 \U00010000 tcl8    1A -1 {} {}
+    iso8859-3 \U00010000 replace 1A -1 {} {}
+    iso8859-3 \U00010000 strict  {}                      0 {} {}
+    iso8859-3 \U0010FFFF tcl8    1A -1 {} {}
+    iso8859-3 \U0010FFFF replace 1A -1 {} {}
+    iso8859-3 \U0010FFFF strict  {}                      0 {} {}
+}; # iso8859-3
+
+#
+# iso8859-4 (generated from glibc-ISO_8859_4-2.1.2)
+
+test encoding-convertfrom-ucmCompare-iso8859-4 {Compare against ICU UCM} -body {
+    ucmConvertfromMismatches iso8859-4 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A4 A4 00A7 A7 00A8 A8 00AD AD 00AF AF 00B0 B0 00B4 B4 00B8 B8 00C1 C1 00C2 C2 00C3 C3 00C4 C4 00C5 C5 00C6 C6 00C9 C9 00CB CB 00CD CD 00CE CE 00D4 D4 00D5 D5 00D6 D6 00D7 D7 00D8 D8 00DA DA 00DB DB 00DC DC 00DF DF 00E1 E1 00E2 E2 00E3 E3 00E4 E4 00E5 E5 00E6 E6 00E9 E9 00EB EB 00ED ED 00EE EE 00F4 F4 00F5 F5 00F6 F6 00F7 F7 00F8 F8 00FA FA 00FB FB 00FC FC 0100 C0 0101 E0 0104 A1 0105 B1 010C C8 010D E8 0110 D0 0111 F0 0112 AA 0113 BA 0116 CC 0117 EC 0118 CA 0119 EA 0122 AB 0123 BB 0128 A5 0129 B5 012A CF 012B EF 012E C7 012F E7 0136 D3 0137 F3 0138 A2 013B A6 013C B6 0145 D1 0146 F1 014A BD 014B BF 014C D2 014D F2 0156 A3 0157 B3 0160 A9 0161 B9 0166 AC 0167 BC 0168 DD 0169 FD 016A DE 016B FE 0172 D9 0173 F9 017D AE 017E BE 02C7 B7 02D9 FF 02DB B2}
+} -result {}
+
+test encoding-convertto-ucmCompare-iso8859-4 {Compare against ICU UCM} -body {
+    ucmConverttoMismatches iso8859-4 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A4 A4 00A7 A7 00A8 A8 00AD AD 00AF AF 00B0 B0 00B4 B4 00B8 B8 00C1 C1 00C2 C2 00C3 C3 00C4 C4 00C5 C5 00C6 C6 00C9 C9 00CB CB 00CD CD 00CE CE 00D4 D4 00D5 D5 00D6 D6 00D7 D7 00D8 D8 00DA DA 00DB DB 00DC DC 00DF DF 00E1 E1 00E2 E2 00E3 E3 00E4 E4 00E5 E5 00E6 E6 00E9 E9 00EB EB 00ED ED 00EE EE 00F4 F4 00F5 F5 00F6 F6 00F7 F7 00F8 F8 00FA FA 00FB FB 00FC FC 0100 C0 0101 E0 0104 A1 0105 B1 010C C8 010D E8 0110 D0 0111 F0 0112 AA 0113 BA 0116 CC 0117 EC 0118 CA 0119 EA 0122 AB 0123 BB 0128 A5 0129 B5 012A CF 012B EF 012E C7 012F E7 0136 D3 0137 F3 0138 A2 013B A6 013C B6 0145 D1 0146 F1 014A BD 014B BF 014C D2 014D F2 0156 A3 0157 B3 0160 A9 0161 B9 0166 AC 0167 BC 0168 DD 0169 FD 016A DE 016B FE 0172 D9 0173 F9 017D AE 017E BE 02C7 B7 02D9 FF 02DB B2}
+} -result {}
+
+# iso8859-4 - invalid byte sequences
+lappend encInvalidBytes {*}{
+}; # iso8859-4
+
+# iso8859-4 - invalid byte sequences
+lappend encUnencodableStrings {*}{
+    iso8859-4 \U000000A1 tcl8    1A -1 {} {}
+    iso8859-4 \U000000A1 replace 1A -1 {} {}
+    iso8859-4 \U000000A1 strict  {}                      0 {} {}
+    iso8859-4 \U00000400 tcl8    1A -1 {} {}
+    iso8859-4 \U00000400 replace 1A -1 {} {}
+    iso8859-4 \U00000400 strict  {}                      0 {} {}
+    iso8859-4 \U0000D800 tcl8    1A -1 {} {}
+    iso8859-4 \U0000D800 replace 1A -1 {} {}
+    iso8859-4 \U0000D800 strict  {}                      0 {} {}
+    iso8859-4 \U0000DC00 tcl8    1A -1 {} {}
+    iso8859-4 \U0000DC00 replace 1A -1 {} {}
+    iso8859-4 \U0000DC00 strict  {}                      0 {} {}
+    iso8859-4 \U00010000 tcl8    1A -1 {} {}
+    iso8859-4 \U00010000 replace 1A -1 {} {}
+    iso8859-4 \U00010000 strict  {}                      0 {} {}
+    iso8859-4 \U0010FFFF tcl8    1A -1 {} {}
+    iso8859-4 \U0010FFFF replace 1A -1 {} {}
+    iso8859-4 \U0010FFFF strict  {}                      0 {} {}
+}; # iso8859-4
+
+#
+# iso8859-5 (generated from glibc-ISO_8859_5-2.1.2)
+
+test encoding-convertfrom-ucmCompare-iso8859-5 {Compare against ICU UCM} -body {
+    ucmConvertfromMismatches iso8859-5 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A7 FD 00AD AD 0401 A1 0402 A2 0403 A3 0404 A4 0405 A5 0406 A6 0407 A7 0408 A8 0409 A9 040A AA 040B AB 040C AC 040E AE 040F AF 0410 B0 0411 B1 0412 B2 0413 B3 0414 B4 0415 B5 0416 B6 0417 B7 0418 B8 0419 B9 041A BA 041B BB 041C BC 041D BD 041E BE 041F BF 0420 C0 0421 C1 0422 C2 0423 C3 0424 C4 0425 C5 0426 C6 0427 C7 0428 C8 0429 C9 042A CA 042B CB 042C CC 042D CD 042E CE 042F CF 0430 D0 0431 D1 0432 D2 0433 D3 0434 D4 0435 D5 0436 D6 0437 D7 0438 D8 0439 D9 043A DA 043B DB 043C DC 043D DD 043E DE 043F DF 0440 E0 0441 E1 0442 E2 0443 E3 0444 E4 0445 E5 0446 E6 0447 E7 0448 E8 0449 E9 044A EA 044B EB 044C EC 044D ED 044E EE 044F EF 0451 F1 0452 F2 0453 F3 0454 F4 0455 F5 0456 F6 0457 F7 0458 F8 0459 F9 045A FA 045B FB 045C FC 045E FE 045F FF 2116 F0}
+} -result {}
+
+test encoding-convertto-ucmCompare-iso8859-5 {Compare against ICU UCM} -body {
+    ucmConverttoMismatches iso8859-5 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A7 FD 00AD AD 0401 A1 0402 A2 0403 A3 0404 A4 0405 A5 0406 A6 0407 A7 0408 A8 0409 A9 040A AA 040B AB 040C AC 040E AE 040F AF 0410 B0 0411 B1 0412 B2 0413 B3 0414 B4 0415 B5 0416 B6 0417 B7 0418 B8 0419 B9 041A BA 041B BB 041C BC 041D BD 041E BE 041F BF 0420 C0 0421 C1 0422 C2 0423 C3 0424 C4 0425 C5 0426 C6 0427 C7 0428 C8 0429 C9 042A CA 042B CB 042C CC 042D CD 042E CE 042F CF 0430 D0 0431 D1 0432 D2 0433 D3 0434 D4 0435 D5 0436 D6 0437 D7 0438 D8 0439 D9 043A DA 043B DB 043C DC 043D DD 043E DE 043F DF 0440 E0 0441 E1 0442 E2 0443 E3 0444 E4 0445 E5 0446 E6 0447 E7 0448 E8 0449 E9 044A EA 044B EB 044C EC 044D ED 044E EE 044F EF 0451 F1 0452 F2 0453 F3 0454 F4 0455 F5 0456 F6 0457 F7 0458 F8 0459 F9 045A FA 045B FB 045C FC 045E FE 045F FF 2116 F0}
+} -result {}
+
+# iso8859-5 - invalid byte sequences
+lappend encInvalidBytes {*}{
+}; # iso8859-5
+
+# iso8859-5 - invalid byte sequences
+lappend encUnencodableStrings {*}{
+    iso8859-5 \U000000A1 tcl8    1A -1 {} {}
+    iso8859-5 \U000000A1 replace 1A -1 {} {}
+    iso8859-5 \U000000A1 strict  {}                      0 {} {}
+    iso8859-5 \U00000400 tcl8    1A -1 {} {}
+    iso8859-5 \U00000400 replace 1A -1 {} {}
+    iso8859-5 \U00000400 strict  {}                      0 {} {}
+    iso8859-5 \U0000D800 tcl8    1A -1 {} {}
+    iso8859-5 \U0000D800 replace 1A -1 {} {}
+    iso8859-5 \U0000D800 strict  {}                      0 {} {}
+    iso8859-5 \U0000DC00 tcl8    1A -1 {} {}
+    iso8859-5 \U0000DC00 replace 1A -1 {} {}
+    iso8859-5 \U0000DC00 strict  {}                      0 {} {}
+    iso8859-5 \U00010000 tcl8    1A -1 {} {}
+    iso8859-5 \U00010000 replace 1A -1 {} {}
+    iso8859-5 \U00010000 strict  {}                      0 {} {}
+    iso8859-5 \U0010FFFF tcl8    1A -1 {} {}
+    iso8859-5 \U0010FFFF replace 1A -1 {} {}
+    iso8859-5 \U0010FFFF strict  {}                      0 {} {}
+}; # iso8859-5
+
+#
+# iso8859-6 (generated from glibc-ISO_8859_6-2.1.2)
+
+test encoding-convertfrom-ucmCompare-iso8859-6 {Compare against ICU UCM} -body {
+    ucmConvertfromMismatches iso8859-6 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A4 A4 00AD AD 060C AC 061B BB 061F BF 0621 C1 0622 C2 0623 C3 0624 C4 0625 C5 0626 C6 0627 C7 0628 C8 0629 C9 062A CA 062B CB 062C CC 062D CD 062E CE 062F CF 0630 D0 0631 D1 0632 D2 0633 D3 0634 D4 0635 D5 0636 D6 0637 D7 0638 D8 0639 D9 063A DA 0640 E0 0641 E1 0642 E2 0643 E3 0644 E4 0645 E5 0646 E6 0647 E7 0648 E8 0649 E9 064A EA 064B EB 064C EC 064D ED 064E EE 064F EF 0650 F0 0651 F1 0652 F2}
+} -result {}
+
+test encoding-convertto-ucmCompare-iso8859-6 {Compare against ICU UCM} -body {
+    ucmConverttoMismatches iso8859-6 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A4 A4 00AD AD 060C AC 061B BB 061F BF 0621 C1 0622 C2 0623 C3 0624 C4 0625 C5 0626 C6 0627 C7 0628 C8 0629 C9 062A CA 062B CB 062C CC 062D CD 062E CE 062F CF 0630 D0 0631 D1 0632 D2 0633 D3 0634 D4 0635 D5 0636 D6 0637 D7 0638 D8 0639 D9 063A DA 0640 E0 0641 E1 0642 E2 0643 E3 0644 E4 0645 E5 0646 E6 0647 E7 0648 E8 0649 E9 064A EA 064B EB 064C EC 064D ED 064E EE 064F EF 0650 F0 0651 F1 0652 F2}
+} -result {}
+
+# iso8859-6 - invalid byte sequences
+lappend encInvalidBytes {*}{
+    iso8859-6 A1 tcl8    \U000000A1 -1 {} {}
+    iso8859-6 A1 replace \uFFFD -1 {} {}
+    iso8859-6 A1 strict  {}       0 {} {}
+    iso8859-6 A2 tcl8    \U000000A2 -1 {} {}
+    iso8859-6 A2 replace \uFFFD -1 {} {}
+    iso8859-6 A2 strict  {}       0 {} {}
+    iso8859-6 A3 tcl8    \U000000A3 -1 {} {}
+    iso8859-6 A3 replace \uFFFD -1 {} {}
+    iso8859-6 A3 strict  {}       0 {} {}
+    iso8859-6 A5 tcl8    \U000000A5 -1 {} {}
+    iso8859-6 A5 replace \uFFFD -1 {} {}
+    iso8859-6 A5 strict  {}       0 {} {}
+    iso8859-6 A6 tcl8    \U000000A6 -1 {} {}
+    iso8859-6 A6 replace \uFFFD -1 {} {}
+    iso8859-6 A6 strict  {}       0 {} {}
+    iso8859-6 A7 tcl8    \U000000A7 -1 {} {}
+    iso8859-6 A7 replace \uFFFD -1 {} {}
+    iso8859-6 A7 strict  {}       0 {} {}
+    iso8859-6 A8 tcl8    \U000000A8 -1 {} {}
+    iso8859-6 A8 replace \uFFFD -1 {} {}
+    iso8859-6 A8 strict  {}       0 {} {}
+    iso8859-6 A9 tcl8    \U000000A9 -1 {} {}
+    iso8859-6 A9 replace \uFFFD -1 {} {}
+    iso8859-6 A9 strict  {}       0 {} {}
+    iso8859-6 AA tcl8    \U000000AA -1 {} {}
+    iso8859-6 AA replace \uFFFD -1 {} {}
+    iso8859-6 AA strict  {}       0 {} {}
+    iso8859-6 AB tcl8    \U000000AB -1 {} {}
+    iso8859-6 AB replace \uFFFD -1 {} {}
+    iso8859-6 AB strict  {}       0 {} {}
+    iso8859-6 AE tcl8    \U000000AE -1 {} {}
+    iso8859-6 AE replace \uFFFD -1 {} {}
+    iso8859-6 AE strict  {}       0 {} {}
+    iso8859-6 AF tcl8    \U000000AF -1 {} {}
+    iso8859-6 AF replace \uFFFD -1 {} {}
+    iso8859-6 AF strict  {}       0 {} {}
+    iso8859-6 B0 tcl8    \U000000B0 -1 {} {}
+    iso8859-6 B0 replace \uFFFD -1 {} {}
+    iso8859-6 B0 strict  {}       0 {} {}
+    iso8859-6 B1 tcl8    \U000000B1 -1 {} {}
+    iso8859-6 B1 replace \uFFFD -1 {} {}
+    iso8859-6 B1 strict  {}       0 {} {}
+    iso8859-6 B2 tcl8    \U000000B2 -1 {} {}
+    iso8859-6 B2 replace \uFFFD -1 {} {}
+    iso8859-6 B2 strict  {}       0 {} {}
+    iso8859-6 B3 tcl8    \U000000B3 -1 {} {}
+    iso8859-6 B3 replace \uFFFD -1 {} {}
+    iso8859-6 B3 strict  {}       0 {} {}
+    iso8859-6 B4 tcl8    \U000000B4 -1 {} {}
+    iso8859-6 B4 replace \uFFFD -1 {} {}
+    iso8859-6 B4 strict  {}       0 {} {}
+    iso8859-6 B5 tcl8    \U000000B5 -1 {} {}
+    iso8859-6 B5 replace \uFFFD -1 {} {}
+    iso8859-6 B5 strict  {}       0 {} {}
+    iso8859-6 B6 tcl8    \U000000B6 -1 {} {}
+    iso8859-6 B6 replace \uFFFD -1 {} {}
+    iso8859-6 B6 strict  {}       0 {} {}
+    iso8859-6 B7 tcl8    \U000000B7 -1 {} {}
+    iso8859-6 B7 replace \uFFFD -1 {} {}
+    iso8859-6 B7 strict  {}       0 {} {}
+    iso8859-6 B8 tcl8    \U000000B8 -1 {} {}
+    iso8859-6 B8 replace \uFFFD -1 {} {}
+    iso8859-6 B8 strict  {}       0 {} {}
+    iso8859-6 B9 tcl8    \U000000B9 -1 {} {}
+    iso8859-6 B9 replace \uFFFD -1 {} {}
+    iso8859-6 B9 strict  {}       0 {} {}
+    iso8859-6 BA tcl8    \U000000BA -1 {} {}
+    iso8859-6 BA replace \uFFFD -1 {} {}
+    iso8859-6 BA strict  {}       0 {} {}
+    iso8859-6 BC tcl8    \U000000BC -1 {} {}
+    iso8859-6 BC replace \uFFFD -1 {} {}
+    iso8859-6 BC strict  {}       0 {} {}
+    iso8859-6 BD tcl8    \U000000BD -1 {} {}
+    iso8859-6 BD replace \uFFFD -1 {} {}
+    iso8859-6 BD strict  {}       0 {} {}
+    iso8859-6 BE tcl8    \U000000BE -1 {} {}
+    iso8859-6 BE replace \uFFFD -1 {} {}
+    iso8859-6 BE strict  {}       0 {} {}
+    iso8859-6 C0 tcl8    \U000000C0 -1 {} {}
+    iso8859-6 C0 replace \uFFFD -1 {} {}
+    iso8859-6 C0 strict  {}       0 {} {}
+    iso8859-6 DB tcl8    \U000000DB -1 {} {}
+    iso8859-6 DB replace \uFFFD -1 {} {}
+    iso8859-6 DB strict  {}       0 {} {}
+    iso8859-6 DC tcl8    \U000000DC -1 {} {}
+    iso8859-6 DC replace \uFFFD -1 {} {}
+    iso8859-6 DC strict  {}       0 {} {}
+    iso8859-6 DD tcl8    \U000000DD -1 {} {}
+    iso8859-6 DD replace \uFFFD -1 {} {}
+    iso8859-6 DD strict  {}       0 {} {}
+    iso8859-6 DE tcl8    \U000000DE -1 {} {}
+    iso8859-6 DE replace \uFFFD -1 {} {}
+    iso8859-6 DE strict  {}       0 {} {}
+    iso8859-6 DF tcl8    \U000000DF -1 {} {}
+    iso8859-6 DF replace \uFFFD -1 {} {}
+    iso8859-6 DF strict  {}       0 {} {}
+    iso8859-6 F3 tcl8    \U000000F3 -1 {} {}
+    iso8859-6 F3 replace \uFFFD -1 {} {}
+    iso8859-6 F3 strict  {}       0 {} {}
+    iso8859-6 F4 tcl8    \U000000F4 -1 {} {}
+    iso8859-6 F4 replace \uFFFD -1 {} {}
+    iso8859-6 F4 strict  {}       0 {} {}
+    iso8859-6 F5 tcl8    \U000000F5 -1 {} {}
+    iso8859-6 F5 replace \uFFFD -1 {} {}
+    iso8859-6 F5 strict  {}       0 {} {}
+    iso8859-6 F6 tcl8    \U000000F6 -1 {} {}
+    iso8859-6 F6 replace \uFFFD -1 {} {}
+    iso8859-6 F6 strict  {}       0 {} {}
+    iso8859-6 F7 tcl8    \U000000F7 -1 {} {}
+    iso8859-6 F7 replace \uFFFD -1 {} {}
+    iso8859-6 F7 strict  {}       0 {} {}
+    iso8859-6 F8 tcl8    \U000000F8 -1 {} {}
+    iso8859-6 F8 replace \uFFFD -1 {} {}
+    iso8859-6 F8 strict  {}       0 {} {}
+    iso8859-6 F9 tcl8    \U000000F9 -1 {} {}
+    iso8859-6 F9 replace \uFFFD -1 {} {}
+    iso8859-6 F9 strict  {}       0 {} {}
+    iso8859-6 FA tcl8    \U000000FA -1 {} {}
+    iso8859-6 FA replace \uFFFD -1 {} {}
+    iso8859-6 FA strict  {}       0 {} {}
+    iso8859-6 FB tcl8    \U000000FB -1 {} {}
+    iso8859-6 FB replace \uFFFD -1 {} {}
+    iso8859-6 FB strict  {}       0 {} {}
+    iso8859-6 FC tcl8    \U000000FC -1 {} {}
+    iso8859-6 FC replace \uFFFD -1 {} {}
+    iso8859-6 FC strict  {}       0 {} {}
+    iso8859-6 FD tcl8    \U000000FD -1 {} {}
+    iso8859-6 FD replace \uFFFD -1 {} {}
+    iso8859-6 FD strict  {}       0 {} {}
+    iso8859-6 FE tcl8    \U000000FE -1 {} {}
+    iso8859-6 FE replace \uFFFD -1 {} {}
+    iso8859-6 FE strict  {}       0 {} {}
+    iso8859-6 FF tcl8    \U000000FF -1 {} {}
+    iso8859-6 FF replace \uFFFD -1 {} {}
+    iso8859-6 FF strict  {}       0 {} {}
+}; # iso8859-6
+
+# iso8859-6 - invalid byte sequences
+lappend encUnencodableStrings {*}{
+    iso8859-6 \U000000A1 tcl8    1A -1 {} {}
+    iso8859-6 \U000000A1 replace 1A -1 {} {}
+    iso8859-6 \U000000A1 strict  {}                      0 {} {}
+    iso8859-6 \U00000400 tcl8    1A -1 {} {}
+    iso8859-6 \U00000400 replace 1A -1 {} {}
+    iso8859-6 \U00000400 strict  {}                      0 {} {}
+    iso8859-6 \U0000D800 tcl8    1A -1 {} {}
+    iso8859-6 \U0000D800 replace 1A -1 {} {}
+    iso8859-6 \U0000D800 strict  {}                      0 {} {}
+    iso8859-6 \U0000DC00 tcl8    1A -1 {} {}
+    iso8859-6 \U0000DC00 replace 1A -1 {} {}
+    iso8859-6 \U0000DC00 strict  {}                      0 {} {}
+    iso8859-6 \U00010000 tcl8    1A -1 {} {}
+    iso8859-6 \U00010000 replace 1A -1 {} {}
+    iso8859-6 \U00010000 strict  {}                      0 {} {}
+    iso8859-6 \U0010FFFF tcl8    1A -1 {} {}
+    iso8859-6 \U0010FFFF replace 1A -1 {} {}
+    iso8859-6 \U0010FFFF strict  {}                      0 {} {}
+}; # iso8859-6
+
+#
+# iso8859-7 (generated from glibc-ISO_8859_7-2.3.3)
+
+test encoding-convertfrom-ucmCompare-iso8859-7 {Compare against ICU UCM} -body {
+    ucmConvertfromMismatches iso8859-7 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A3 A3 00A6 A6 00A7 A7 00A8 A8 00A9 A9 00AB AB 00AC AC 00AD AD 00B0 B0 00B1 B1 00B2 B2 00B3 B3 00B7 B7 00BB BB 00BD BD 037A AA 0384 B4 0385 B5 0386 B6 0388 B8 0389 B9 038A BA 038C BC 038E BE 038F BF 0390 C0 0391 C1 0392 C2 0393 C3 0394 C4 0395 C5 0396 C6 0397 C7 0398 C8 0399 C9 039A CA 039B CB 039C CC 039D CD 039E CE 039F CF 03A0 D0 03A1 D1 03A3 D3 03A4 D4 03A5 D5 03A6 D6 03A7 D7 03A8 D8 03A9 D9 03AA DA 03AB DB 03AC DC 03AD DD 03AE DE 03AF DF 03B0 E0 03B1 E1 03B2 E2 03B3 E3 03B4 E4 03B5 E5 03B6 E6 03B7 E7 03B8 E8 03B9 E9 03BA EA 03BB EB 03BC EC 03BD ED 03BE EE 03BF EF 03C0 F0 03C1 F1 03C2 F2 03C3 F3 03C4 F4 03C5 F5 03C6 F6 03C7 F7 03C8 F8 03C9 F9 03CA FA 03CB FB 03CC FC 03CD FD 03CE FE 2015 AF 2018 A1 2019 A2 20AC A4 20AF A5}
+} -result {}
+
+test encoding-convertto-ucmCompare-iso8859-7 {Compare against ICU UCM} -body {
+    ucmConverttoMismatches iso8859-7 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A3 A3 00A6 A6 00A7 A7 00A8 A8 00A9 A9 00AB AB 00AC AC 00AD AD 00B0 B0 00B1 B1 00B2 B2 00B3 B3 00B7 B7 00BB BB 00BD BD 037A AA 0384 B4 0385 B5 0386 B6 0388 B8 0389 B9 038A BA 038C BC 038E BE 038F BF 0390 C0 0391 C1 0392 C2 0393 C3 0394 C4 0395 C5 0396 C6 0397 C7 0398 C8 0399 C9 039A CA 039B CB 039C CC 039D CD 039E CE 039F CF 03A0 D0 03A1 D1 03A3 D3 03A4 D4 03A5 D5 03A6 D6 03A7 D7 03A8 D8 03A9 D9 03AA DA 03AB DB 03AC DC 03AD DD 03AE DE 03AF DF 03B0 E0 03B1 E1 03B2 E2 03B3 E3 03B4 E4 03B5 E5 03B6 E6 03B7 E7 03B8 E8 03B9 E9 03BA EA 03BB EB 03BC EC 03BD ED 03BE EE 03BF EF 03C0 F0 03C1 F1 03C2 F2 03C3 F3 03C4 F4 03C5 F5 03C6 F6 03C7 F7 03C8 F8 03C9 F9 03CA FA 03CB FB 03CC FC 03CD FD 03CE FE 2015 AF 2018 A1 2019 A2 20AC A4 20AF A5}
+} -result {}
+
+# iso8859-7 - invalid byte sequences
+lappend encInvalidBytes {*}{
+    iso8859-7 AE tcl8    \U000000AE -1 {} {}
+    iso8859-7 AE replace \uFFFD -1 {} {}
+    iso8859-7 AE strict  {}       0 {} {}
+    iso8859-7 D2 tcl8    \U000000D2 -1 {} {}
+    iso8859-7 D2 replace \uFFFD -1 {} {}
+    iso8859-7 D2 strict  {}       0 {} {}
+    iso8859-7 FF tcl8    \U000000FF -1 {} {}
+    iso8859-7 FF replace \uFFFD -1 {} {}
+    iso8859-7 FF strict  {}       0 {} {}
+}; # iso8859-7
+
+# iso8859-7 - invalid byte sequences
+lappend encUnencodableStrings {*}{
+    iso8859-7 \U000000A1 tcl8    1A -1 {} {}
+    iso8859-7 \U000000A1 replace 1A -1 {} {}
+    iso8859-7 \U000000A1 strict  {}                      0 {} {}
+    iso8859-7 \U00000400 tcl8    1A -1 {} {}
+    iso8859-7 \U00000400 replace 1A -1 {} {}
+    iso8859-7 \U00000400 strict  {}                      0 {} {}
+    iso8859-7 \U0000D800 tcl8    1A -1 {} {}
+    iso8859-7 \U0000D800 replace 1A -1 {} {}
+    iso8859-7 \U0000D800 strict  {}                      0 {} {}
+    iso8859-7 \U0000DC00 tcl8    1A -1 {} {}
+    iso8859-7 \U0000DC00 replace 1A -1 {} {}
+    iso8859-7 \U0000DC00 strict  {}                      0 {} {}
+    iso8859-7 \U00010000 tcl8    1A -1 {} {}
+    iso8859-7 \U00010000 replace 1A -1 {} {}
+    iso8859-7 \U00010000 strict  {}                      0 {} {}
+    iso8859-7 \U0010FFFF tcl8    1A -1 {} {}
+    iso8859-7 \U0010FFFF replace 1A -1 {} {}
+    iso8859-7 \U0010FFFF strict  {}                      0 {} {}
+}; # iso8859-7
+
+#
+# iso8859-8 (generated from glibc-ISO_8859_8-2.3.3)
+
+test encoding-convertfrom-ucmCompare-iso8859-8 {Compare against ICU UCM} -body {
+    ucmConvertfromMismatches iso8859-8 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A2 A2 00A3 A3 00A4 A4 00A5 A5 00A6 A6 00A7 A7 00A8 A8 00A9 A9 00AB AB 00AC AC 00AD AD 00AE AE 00AF AF 00B0 B0 00B1 B1 00B2 B2 00B3 B3 00B4 B4 00B5 B5 00B6 B6 00B7 B7 00B8 B8 00B9 B9 00BB BB 00BC BC 00BD BD 00BE BE 00D7 AA 00F7 BA 05D0 E0 05D1 E1 05D2 E2 05D3 E3 05D4 E4 05D5 E5 05D6 E6 05D7 E7 05D8 E8 05D9 E9 05DA EA 05DB EB 05DC EC 05DD ED 05DE EE 05DF EF 05E0 F0 05E1 F1 05E2 F2 05E3 F3 05E4 F4 05E5 F5 05E6 F6 05E7 F7 05E8 F8 05E9 F9 05EA FA 200E FD 200F FE 2017 DF}
+} -result {}
+
+test encoding-convertto-ucmCompare-iso8859-8 {Compare against ICU UCM} -body {
+    ucmConverttoMismatches iso8859-8 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A2 A2 00A3 A3 00A4 A4 00A5 A5 00A6 A6 00A7 A7 00A8 A8 00A9 A9 00AB AB 00AC AC 00AD AD 00AE AE 00AF AF 00B0 B0 00B1 B1 00B2 B2 00B3 B3 00B4 B4 00B5 B5 00B6 B6 00B7 B7 00B8 B8 00B9 B9 00BB BB 00BC BC 00BD BD 00BE BE 00D7 AA 00F7 BA 05D0 E0 05D1 E1 05D2 E2 05D3 E3 05D4 E4 05D5 E5 05D6 E6 05D7 E7 05D8 E8 05D9 E9 05DA EA 05DB EB 05DC EC 05DD ED 05DE EE 05DF EF 05E0 F0 05E1 F1 05E2 F2 05E3 F3 05E4 F4 05E5 F5 05E6 F6 05E7 F7 05E8 F8 05E9 F9 05EA FA 200E FD 200F FE 2017 DF}
+} -result {}
+
+# iso8859-8 - invalid byte sequences
+lappend encInvalidBytes {*}{
+    iso8859-8 A1 tcl8    \U000000A1 -1 {} {}
+    iso8859-8 A1 replace \uFFFD -1 {} {}
+    iso8859-8 A1 strict  {}       0 {} {}
+    iso8859-8 BF tcl8    \U000000BF -1 {} {}
+    iso8859-8 BF replace \uFFFD -1 {} {}
+    iso8859-8 BF strict  {}       0 {} {}
+    iso8859-8 C0 tcl8    \U000000C0 -1 {} {}
+    iso8859-8 C0 replace \uFFFD -1 {} {}
+    iso8859-8 C0 strict  {}       0 {} {}
+    iso8859-8 C1 tcl8    \U000000C1 -1 {} {}
+    iso8859-8 C1 replace \uFFFD -1 {} {}
+    iso8859-8 C1 strict  {}       0 {} {}
+    iso8859-8 C2 tcl8    \U000000C2 -1 {} {}
+    iso8859-8 C2 replace \uFFFD -1 {} {}
+    iso8859-8 C2 strict  {}       0 {} {}
+    iso8859-8 C3 tcl8    \U000000C3 -1 {} {}
+    iso8859-8 C3 replace \uFFFD -1 {} {}
+    iso8859-8 C3 strict  {}       0 {} {}
+    iso8859-8 C4 tcl8    \U000000C4 -1 {} {}
+    iso8859-8 C4 replace \uFFFD -1 {} {}
+    iso8859-8 C4 strict  {}       0 {} {}
+    iso8859-8 C5 tcl8    \U000000C5 -1 {} {}
+    iso8859-8 C5 replace \uFFFD -1 {} {}
+    iso8859-8 C5 strict  {}       0 {} {}
+    iso8859-8 C6 tcl8    \U000000C6 -1 {} {}
+    iso8859-8 C6 replace \uFFFD -1 {} {}
+    iso8859-8 C6 strict  {}       0 {} {}
+    iso8859-8 C7 tcl8    \U000000C7 -1 {} {}
+    iso8859-8 C7 replace \uFFFD -1 {} {}
+    iso8859-8 C7 strict  {}       0 {} {}
+    iso8859-8 C8 tcl8    \U000000C8 -1 {} {}
+    iso8859-8 C8 replace \uFFFD -1 {} {}
+    iso8859-8 C8 strict  {}       0 {} {}
+    iso8859-8 C9 tcl8    \U000000C9 -1 {} {}
+    iso8859-8 C9 replace \uFFFD -1 {} {}
+    iso8859-8 C9 strict  {}       0 {} {}
+    iso8859-8 CA tcl8    \U000000CA -1 {} {}
+    iso8859-8 CA replace \uFFFD -1 {} {}
+    iso8859-8 CA strict  {}       0 {} {}
+    iso8859-8 CB tcl8    \U000000CB -1 {} {}
+    iso8859-8 CB replace \uFFFD -1 {} {}
+    iso8859-8 CB strict  {}       0 {} {}
+    iso8859-8 CC tcl8    \U000000CC -1 {} {}
+    iso8859-8 CC replace \uFFFD -1 {} {}
+    iso8859-8 CC strict  {}       0 {} {}
+    iso8859-8 CD tcl8    \U000000CD -1 {} {}
+    iso8859-8 CD replace \uFFFD -1 {} {}
+    iso8859-8 CD strict  {}       0 {} {}
+    iso8859-8 CE tcl8    \U000000CE -1 {} {}
+    iso8859-8 CE replace \uFFFD -1 {} {}
+    iso8859-8 CE strict  {}       0 {} {}
+    iso8859-8 CF tcl8    \U000000CF -1 {} {}
+    iso8859-8 CF replace \uFFFD -1 {} {}
+    iso8859-8 CF strict  {}       0 {} {}
+    iso8859-8 D0 tcl8    \U000000D0 -1 {} {}
+    iso8859-8 D0 replace \uFFFD -1 {} {}
+    iso8859-8 D0 strict  {}       0 {} {}
+    iso8859-8 D1 tcl8    \U000000D1 -1 {} {}
+    iso8859-8 D1 replace \uFFFD -1 {} {}
+    iso8859-8 D1 strict  {}       0 {} {}
+    iso8859-8 D2 tcl8    \U000000D2 -1 {} {}
+    iso8859-8 D2 replace \uFFFD -1 {} {}
+    iso8859-8 D2 strict  {}       0 {} {}
+    iso8859-8 D3 tcl8    \U000000D3 -1 {} {}
+    iso8859-8 D3 replace \uFFFD -1 {} {}
+    iso8859-8 D3 strict  {}       0 {} {}
+    iso8859-8 D4 tcl8    \U000000D4 -1 {} {}
+    iso8859-8 D4 replace \uFFFD -1 {} {}
+    iso8859-8 D4 strict  {}       0 {} {}
+    iso8859-8 D5 tcl8    \U000000D5 -1 {} {}
+    iso8859-8 D5 replace \uFFFD -1 {} {}
+    iso8859-8 D5 strict  {}       0 {} {}
+    iso8859-8 D6 tcl8    \U000000D6 -1 {} {}
+    iso8859-8 D6 replace \uFFFD -1 {} {}
+    iso8859-8 D6 strict  {}       0 {} {}
+    iso8859-8 D7 tcl8    \U000000D7 -1 {} {}
+    iso8859-8 D7 replace \uFFFD -1 {} {}
+    iso8859-8 D7 strict  {}       0 {} {}
+    iso8859-8 D8 tcl8    \U000000D8 -1 {} {}
+    iso8859-8 D8 replace \uFFFD -1 {} {}
+    iso8859-8 D8 strict  {}       0 {} {}
+    iso8859-8 D9 tcl8    \U000000D9 -1 {} {}
+    iso8859-8 D9 replace \uFFFD -1 {} {}
+    iso8859-8 D9 strict  {}       0 {} {}
+    iso8859-8 DA tcl8    \U000000DA -1 {} {}
+    iso8859-8 DA replace \uFFFD -1 {} {}
+    iso8859-8 DA strict  {}       0 {} {}
+    iso8859-8 DB tcl8    \U000000DB -1 {} {}
+    iso8859-8 DB replace \uFFFD -1 {} {}
+    iso8859-8 DB strict  {}       0 {} {}
+    iso8859-8 DC tcl8    \U000000DC -1 {} {}
+    iso8859-8 DC replace \uFFFD -1 {} {}
+    iso8859-8 DC strict  {}       0 {} {}
+    iso8859-8 DD tcl8    \U000000DD -1 {} {}
+    iso8859-8 DD replace \uFFFD -1 {} {}
+    iso8859-8 DD strict  {}       0 {} {}
+    iso8859-8 DE tcl8    \U000000DE -1 {} {}
+    iso8859-8 DE replace \uFFFD -1 {} {}
+    iso8859-8 DE strict  {}       0 {} {}
+    iso8859-8 FB tcl8    \U000000FB -1 {} {}
+    iso8859-8 FB replace \uFFFD -1 {} {}
+    iso8859-8 FB strict  {}       0 {} {}
+    iso8859-8 FC tcl8    \U000000FC -1 {} {}
+    iso8859-8 FC replace \uFFFD -1 {} {}
+    iso8859-8 FC strict  {}       0 {} {}
+    iso8859-8 FF tcl8    \U000000FF -1 {} {}
+    iso8859-8 FF replace \uFFFD -1 {} {}
+    iso8859-8 FF strict  {}       0 {} {}
+}; # iso8859-8
+
+# iso8859-8 - invalid byte sequences
+lappend encUnencodableStrings {*}{
+    iso8859-8 \U000000A1 tcl8    1A -1 {} {}
+    iso8859-8 \U000000A1 replace 1A -1 {} {}
+    iso8859-8 \U000000A1 strict  {}                      0 {} {}
+    iso8859-8 \U00000400 tcl8    1A -1 {} {}
+    iso8859-8 \U00000400 replace 1A -1 {} {}
+    iso8859-8 \U00000400 strict  {}                      0 {} {}
+    iso8859-8 \U0000D800 tcl8    1A -1 {} {}
+    iso8859-8 \U0000D800 replace 1A -1 {} {}
+    iso8859-8 \U0000D800 strict  {}                      0 {} {}
+    iso8859-8 \U0000DC00 tcl8    1A -1 {} {}
+    iso8859-8 \U0000DC00 replace 1A -1 {} {}
+    iso8859-8 \U0000DC00 strict  {}                      0 {} {}
+    iso8859-8 \U00010000 tcl8    1A -1 {} {}
+    iso8859-8 \U00010000 replace 1A -1 {} {}
+    iso8859-8 \U00010000 strict  {}                      0 {} {}
+    iso8859-8 \U0010FFFF tcl8    1A -1 {} {}
+    iso8859-8 \U0010FFFF replace 1A -1 {} {}
+    iso8859-8 \U0010FFFF strict  {}                      0 {} {}
+}; # iso8859-8
+
+#
+# iso8859-9 (generated from glibc-ISO_8859_9-2.1.2)
+
+test encoding-convertfrom-ucmCompare-iso8859-9 {Compare against ICU UCM} -body {
+    ucmConvertfromMismatches iso8859-9 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A1 A1 00A2 A2 00A3 A3 00A4 A4 00A5 A5 00A6 A6 00A7 A7 00A8 A8 00A9 A9 00AA AA 00AB AB 00AC AC 00AD AD 00AE AE 00AF AF 00B0 B0 00B1 B1 00B2 B2 00B3 B3 00B4 B4 00B5 B5 00B6 B6 00B7 B7 00B8 B8 00B9 B9 00BA BA 00BB BB 00BC BC 00BD BD 00BE BE 00BF BF 00C0 C0 00C1 C1 00C2 C2 00C3 C3 00C4 C4 00C5 C5 00C6 C6 00C7 C7 00C8 C8 00C9 C9 00CA CA 00CB CB 00CC CC 00CD CD 00CE CE 00CF CF 00D1 D1 00D2 D2 00D3 D3 00D4 D4 00D5 D5 00D6 D6 00D7 D7 00D8 D8 00D9 D9 00DA DA 00DB DB 00DC DC 00DF DF 00E0 E0 00E1 E1 00E2 E2 00E3 E3 00E4 E4 00E5 E5 00E6 E6 00E7 E7 00E8 E8 00E9 E9 00EA EA 00EB EB 00EC EC 00ED ED 00EE EE 00EF EF 00F1 F1 00F2 F2 00F3 F3 00F4 F4 00F5 F5 00F6 F6 00F7 F7 00F8 F8 00F9 F9 00FA FA 00FB FB 00FC FC 00FF FF 011E D0 011F F0 0130 DD 0131 FD 015E DE 015F FE}
+} -result {}
+
+test encoding-convertto-ucmCompare-iso8859-9 {Compare against ICU UCM} -body {
+    ucmConverttoMismatches iso8859-9 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A1 A1 00A2 A2 00A3 A3 00A4 A4 00A5 A5 00A6 A6 00A7 A7 00A8 A8 00A9 A9 00AA AA 00AB AB 00AC AC 00AD AD 00AE AE 00AF AF 00B0 B0 00B1 B1 00B2 B2 00B3 B3 00B4 B4 00B5 B5 00B6 B6 00B7 B7 00B8 B8 00B9 B9 00BA BA 00BB BB 00BC BC 00BD BD 00BE BE 00BF BF 00C0 C0 00C1 C1 00C2 C2 00C3 C3 00C4 C4 00C5 C5 00C6 C6 00C7 C7 00C8 C8 00C9 C9 00CA CA 00CB CB 00CC CC 00CD CD 00CE CE 00CF CF 00D1 D1 00D2 D2 00D3 D3 00D4 D4 00D5 D5 00D6 D6 00D7 D7 00D8 D8 00D9 D9 00DA DA 00DB DB 00DC DC 00DF DF 00E0 E0 00E1 E1 00E2 E2 00E3 E3 00E4 E4 00E5 E5 00E6 E6 00E7 E7 00E8 E8 00E9 E9 00EA EA 00EB EB 00EC EC 00ED ED 00EE EE 00EF EF 00F1 F1 00F2 F2 00F3 F3 00F4 F4 00F5 F5 00F6 F6 00F7 F7 00F8 F8 00F9 F9 00FA FA 00FB FB 00FC FC 00FF FF 011E D0 011F F0 0130 DD 0131 FD 015E DE 015F FE}
+} -result {}
+
+# iso8859-9 - invalid byte sequences
+lappend encInvalidBytes {*}{
+}; # iso8859-9
+
+# iso8859-9 - invalid byte sequences
+lappend encUnencodableStrings {*}{
+    iso8859-9 \U000000D0 tcl8    1A -1 {} {}
+    iso8859-9 \U000000D0 replace 1A -1 {} {}
+    iso8859-9 \U000000D0 strict  {}                      0 {} {}
+    iso8859-9 \U00000400 tcl8    1A -1 {} {}
+    iso8859-9 \U00000400 replace 1A -1 {} {}
+    iso8859-9 \U00000400 strict  {}                      0 {} {}
+    iso8859-9 \U0000D800 tcl8    1A -1 {} {}
+    iso8859-9 \U0000D800 replace 1A -1 {} {}
+    iso8859-9 \U0000D800 strict  {}                      0 {} {}
+    iso8859-9 \U0000DC00 tcl8    1A -1 {} {}
+    iso8859-9 \U0000DC00 replace 1A -1 {} {}
+    iso8859-9 \U0000DC00 strict  {}                      0 {} {}
+    iso8859-9 \U00010000 tcl8    1A -1 {} {}
+    iso8859-9 \U00010000 replace 1A -1 {} {}
+    iso8859-9 \U00010000 strict  {}                      0 {} {}
+    iso8859-9 \U0010FFFF tcl8    1A -1 {} {}
+    iso8859-9 \U0010FFFF replace 1A -1 {} {}
+    iso8859-9 \U0010FFFF strict  {}                      0 {} {}
+}; # iso8859-9
+
+#
+# iso8859-10 (generated from glibc-ISO_8859_10-2.1.2)
+
+test encoding-convertfrom-ucmCompare-iso8859-10 {Compare against ICU UCM} -body {
+    ucmConvertfromMismatches iso8859-10 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A7 A7 00AD AD 00B0 B0 00B7 B7 00C1 C1 00C2 C2 00C3 C3 00C4 C4 00C5 C5 00C6 C6 00C9 C9 00CB CB 00CD CD 00CE CE 00CF CF 00D0 D0 00D3 D3 00D4 D4 00D5 D5 00D6 D6 00D8 D8 00DA DA 00DB DB 00DC DC 00DD DD 00DE DE 00DF DF 00E1 E1 00E2 E2 00E3 E3 00E4 E4 00E5 E5 00E6 E6 00E9 E9 00EB EB 00ED ED 00EE EE 00EF EF 00F0 F0 00F3 F3 00F4 F4 00F5 F5 00F6 F6 00F8 F8 00FA FA 00FB FB 00FC FC 00FD FD 00FE FE 0100 C0 0101 E0 0104 A1 0105 B1 010C C8 010D E8 0110 A9 0111 B9 0112 A2 0113 B2 0116 CC 0117 EC 0118 CA 0119 EA 0122 A3 0123 B3 0128 A5 0129 B5 012A A4 012B B4 012E C7 012F E7 0136 A6 0137 B6 0138 FF 013B A8 013C B8 0145 D1 0146 F1 014A AF 014B BF 014C D2 014D F2 0160 AA 0161 BA 0166 AB 0167 BB 0168 D7 0169 F7 016A AE 016B BE 0172 D9 0173 F9 017D AC 017E BC 2015 BD}
+} -result {}
+
+test encoding-convertto-ucmCompare-iso8859-10 {Compare against ICU UCM} -body {
+    ucmConverttoMismatches iso8859-10 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A7 A7 00AD AD 00B0 B0 00B7 B7 00C1 C1 00C2 C2 00C3 C3 00C4 C4 00C5 C5 00C6 C6 00C9 C9 00CB CB 00CD CD 00CE CE 00CF CF 00D0 D0 00D3 D3 00D4 D4 00D5 D5 00D6 D6 00D8 D8 00DA DA 00DB DB 00DC DC 00DD DD 00DE DE 00DF DF 00E1 E1 00E2 E2 00E3 E3 00E4 E4 00E5 E5 00E6 E6 00E9 E9 00EB EB 00ED ED 00EE EE 00EF EF 00F0 F0 00F3 F3 00F4 F4 00F5 F5 00F6 F6 00F8 F8 00FA FA 00FB FB 00FC FC 00FD FD 00FE FE 0100 C0 0101 E0 0104 A1 0105 B1 010C C8 010D E8 0110 A9 0111 B9 0112 A2 0113 B2 0116 CC 0117 EC 0118 CA 0119 EA 0122 A3 0123 B3 0128 A5 0129 B5 012A A4 012B B4 012E C7 012F E7 0136 A6 0137 B6 0138 FF 013B A8 013C B8 0145 D1 0146 F1 014A AF 014B BF 014C D2 014D F2 0160 AA 0161 BA 0166 AB 0167 BB 0168 D7 0169 F7 016A AE 016B BE 0172 D9 0173 F9 017D AC 017E BC 2015 BD}
+} -result {}
+
+# iso8859-10 - invalid byte sequences
+lappend encInvalidBytes {*}{
+}; # iso8859-10
+
+# iso8859-10 - invalid byte sequences
+lappend encUnencodableStrings {*}{
+    iso8859-10 \U000000A1 tcl8    1A -1 {} {}
+    iso8859-10 \U000000A1 replace 1A -1 {} {}
+    iso8859-10 \U000000A1 strict  {}                      0 {} {}
+    iso8859-10 \U00000400 tcl8    1A -1 {} {}
+    iso8859-10 \U00000400 replace 1A -1 {} {}
+    iso8859-10 \U00000400 strict  {}                      0 {} {}
+    iso8859-10 \U0000D800 tcl8    1A -1 {} {}
+    iso8859-10 \U0000D800 replace 1A -1 {} {}
+    iso8859-10 \U0000D800 strict  {}                      0 {} {}
+    iso8859-10 \U0000DC00 tcl8    1A -1 {} {}
+    iso8859-10 \U0000DC00 replace 1A -1 {} {}
+    iso8859-10 \U0000DC00 strict  {}                      0 {} {}
+    iso8859-10 \U00010000 tcl8    1A -1 {} {}
+    iso8859-10 \U00010000 replace 1A -1 {} {}
+    iso8859-10 \U00010000 strict  {}                      0 {} {}
+    iso8859-10 \U0010FFFF tcl8    1A -1 {} {}
+    iso8859-10 \U0010FFFF replace 1A -1 {} {}
+    iso8859-10 \U0010FFFF strict  {}                      0 {} {}
+}; # iso8859-10
+
+#
+# iso8859-11 (generated from glibc-ISO_8859_11-2.1.2)
+
+test encoding-convertfrom-ucmCompare-iso8859-11 {Compare against ICU UCM} -body {
+    ucmConvertfromMismatches iso8859-11 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 0E01 A1 0E02 A2 0E03 A3 0E04 A4 0E05 A5 0E06 A6 0E07 A7 0E08 A8 0E09 A9 0E0A AA 0E0B AB 0E0C AC 0E0D AD 0E0E AE 0E0F AF 0E10 B0 0E11 B1 0E12 B2 0E13 B3 0E14 B4 0E15 B5 0E16 B6 0E17 B7 0E18 B8 0E19 B9 0E1A BA 0E1B BB 0E1C BC 0E1D BD 0E1E BE 0E1F BF 0E20 C0 0E21 C1 0E22 C2 0E23 C3 0E24 C4 0E25 C5 0E26 C6 0E27 C7 0E28 C8 0E29 C9 0E2A CA 0E2B CB 0E2C CC 0E2D CD 0E2E CE 0E2F CF 0E30 D0 0E31 D1 0E32 D2 0E33 D3 0E34 D4 0E35 D5 0E36 D6 0E37 D7 0E38 D8 0E39 D9 0E3A DA 0E3F DF 0E40 E0 0E41 E1 0E42 E2 0E43 E3 0E44 E4 0E45 E5 0E46 E6 0E47 E7 0E48 E8 0E49 E9 0E4A EA 0E4B EB 0E4C EC 0E4D ED 0E4E EE 0E4F EF 0E50 F0 0E51 F1 0E52 F2 0E53 F3 0E54 F4 0E55 F5 0E56 F6 0E57 F7 0E58 F8 0E59 F9 0E5A FA 0E5B FB}
+} -result {}
+
+test encoding-convertto-ucmCompare-iso8859-11 {Compare against ICU UCM} -body {
+    ucmConverttoMismatches iso8859-11 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 0E01 A1 0E02 A2 0E03 A3 0E04 A4 0E05 A5 0E06 A6 0E07 A7 0E08 A8 0E09 A9 0E0A AA 0E0B AB 0E0C AC 0E0D AD 0E0E AE 0E0F AF 0E10 B0 0E11 B1 0E12 B2 0E13 B3 0E14 B4 0E15 B5 0E16 B6 0E17 B7 0E18 B8 0E19 B9 0E1A BA 0E1B BB 0E1C BC 0E1D BD 0E1E BE 0E1F BF 0E20 C0 0E21 C1 0E22 C2 0E23 C3 0E24 C4 0E25 C5 0E26 C6 0E27 C7 0E28 C8 0E29 C9 0E2A CA 0E2B CB 0E2C CC 0E2D CD 0E2E CE 0E2F CF 0E30 D0 0E31 D1 0E32 D2 0E33 D3 0E34 D4 0E35 D5 0E36 D6 0E37 D7 0E38 D8 0E39 D9 0E3A DA 0E3F DF 0E40 E0 0E41 E1 0E42 E2 0E43 E3 0E44 E4 0E45 E5 0E46 E6 0E47 E7 0E48 E8 0E49 E9 0E4A EA 0E4B EB 0E4C EC 0E4D ED 0E4E EE 0E4F EF 0E50 F0 0E51 F1 0E52 F2 0E53 F3 0E54 F4 0E55 F5 0E56 F6 0E57 F7 0E58 F8 0E59 F9 0E5A FA 0E5B FB}
+} -result {}
+
+# iso8859-11 - invalid byte sequences
+lappend encInvalidBytes {*}{
+    iso8859-11 DB tcl8    \U000000DB -1 {} {}
+    iso8859-11 DB replace \uFFFD -1 {} {}
+    iso8859-11 DB strict  {}       0 {} {}
+    iso8859-11 DC tcl8    \U000000DC -1 {} {}
+    iso8859-11 DC replace \uFFFD -1 {} {}
+    iso8859-11 DC strict  {}       0 {} {}
+    iso8859-11 DD tcl8    \U000000DD -1 {} {}
+    iso8859-11 DD replace \uFFFD -1 {} {}
+    iso8859-11 DD strict  {}       0 {} {}
+    iso8859-11 DE tcl8    \U000000DE -1 {} {}
+    iso8859-11 DE replace \uFFFD -1 {} {}
+    iso8859-11 DE strict  {}       0 {} {}
+    iso8859-11 FC tcl8    \U000000FC -1 {} {}
+    iso8859-11 FC replace \uFFFD -1 {} {}
+    iso8859-11 FC strict  {}       0 {} {}
+    iso8859-11 FD tcl8    \U000000FD -1 {} {}
+    iso8859-11 FD replace \uFFFD -1 {} {}
+    iso8859-11 FD strict  {}       0 {} {}
+    iso8859-11 FE tcl8    \U000000FE -1 {} {}
+    iso8859-11 FE replace \uFFFD -1 {} {}
+    iso8859-11 FE strict  {}       0 {} {}
+    iso8859-11 FF tcl8    \U000000FF -1 {} {}
+    iso8859-11 FF replace \uFFFD -1 {} {}
+    iso8859-11 FF strict  {}       0 {} {}
+}; # iso8859-11
+
+# iso8859-11 - invalid byte sequences
+lappend encUnencodableStrings {*}{
+    iso8859-11 \U000000A1 tcl8    1A -1 {} {}
+    iso8859-11 \U000000A1 replace 1A -1 {} {}
+    iso8859-11 \U000000A1 strict  {}                      0 {} {}
+    iso8859-11 \U00000400 tcl8    1A -1 {} {}
+    iso8859-11 \U00000400 replace 1A -1 {} {}
+    iso8859-11 \U00000400 strict  {}                      0 {} {}
+    iso8859-11 \U0000D800 tcl8    1A -1 {} {}
+    iso8859-11 \U0000D800 replace 1A -1 {} {}
+    iso8859-11 \U0000D800 strict  {}                      0 {} {}
+    iso8859-11 \U0000DC00 tcl8    1A -1 {} {}
+    iso8859-11 \U0000DC00 replace 1A -1 {} {}
+    iso8859-11 \U0000DC00 strict  {}                      0 {} {}
+    iso8859-11 \U00010000 tcl8    1A -1 {} {}
+    iso8859-11 \U00010000 replace 1A -1 {} {}
+    iso8859-11 \U00010000 strict  {}                      0 {} {}
+    iso8859-11 \U0010FFFF tcl8    1A -1 {} {}
+    iso8859-11 \U0010FFFF replace 1A -1 {} {}
+    iso8859-11 \U0010FFFF strict  {}                      0 {} {}
+}; # iso8859-11
+
+#
+# iso8859-13 (generated from glibc-ISO_8859_13-2.3.3)
+
+test encoding-convertfrom-ucmCompare-iso8859-13 {Compare against ICU UCM} -body {
+    ucmConvertfromMismatches iso8859-13 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A2 A2 00A3 A3 00A4 A4 00A6 A6 00A7 A7 00A9 A9 00AB AB 00AC AC 00AD AD 00AE AE 00B0 B0 00B1 B1 00B2 B2 00B3 B3 00B5 B5 00B6 B6 00B7 B7 00B9 B9 00BB BB 00BC BC 00BD BD 00BE BE 00C4 C4 00C5 C5 00C6 AF 00C9 C9 00D3 D3 00D5 D5 00D6 D6 00D7 D7 00D8 A8 00DC DC 00DF DF 00E4 E4 00E5 E5 00E6 BF 00E9 E9 00F3 F3 00F5 F5 00F6 F6 00F7 F7 00F8 B8 00FC FC 0100 C2 0101 E2 0104 C0 0105 E0 0106 C3 0107 E3 010C C8 010D E8 0112 C7 0113 E7 0116 CB 0117 EB 0118 C6 0119 E6 0122 CC 0123 EC 012A CE 012B EE 012E C1 012F E1 0136 CD 0137 ED 013B CF 013C EF 0141 D9 0142 F9 0143 D1 0144 F1 0145 D2 0146 F2 014C D4 014D F4 0156 AA 0157 BA 015A DA 015B FA 0160 D0 0161 F0 016A DB 016B FB 0172 D8 0173 F8 0179 CA 017A EA 017B DD 017C FD 017D DE 017E FE 2019 FF 201C B4 201D A1 201E A5}
+} -result {}
+
+test encoding-convertto-ucmCompare-iso8859-13 {Compare against ICU UCM} -body {
+    ucmConverttoMismatches iso8859-13 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A2 A2 00A3 A3 00A4 A4 00A6 A6 00A7 A7 00A9 A9 00AB AB 00AC AC 00AD AD 00AE AE 00B0 B0 00B1 B1 00B2 B2 00B3 B3 00B5 B5 00B6 B6 00B7 B7 00B9 B9 00BB BB 00BC BC 00BD BD 00BE BE 00C4 C4 00C5 C5 00C6 AF 00C9 C9 00D3 D3 00D5 D5 00D6 D6 00D7 D7 00D8 A8 00DC DC 00DF DF 00E4 E4 00E5 E5 00E6 BF 00E9 E9 00F3 F3 00F5 F5 00F6 F6 00F7 F7 00F8 B8 00FC FC 0100 C2 0101 E2 0104 C0 0105 E0 0106 C3 0107 E3 010C C8 010D E8 0112 C7 0113 E7 0116 CB 0117 EB 0118 C6 0119 E6 0122 CC 0123 EC 012A CE 012B EE 012E C1 012F E1 0136 CD 0137 ED 013B CF 013C EF 0141 D9 0142 F9 0143 D1 0144 F1 0145 D2 0146 F2 014C D4 014D F4 0156 AA 0157 BA 015A DA 015B FA 0160 D0 0161 F0 016A DB 016B FB 0172 D8 0173 F8 0179 CA 017A EA 017B DD 017C FD 017D DE 017E FE 2019 FF 201C B4 201D A1 201E A5}
+} -result {}
+
+# iso8859-13 - invalid byte sequences
+lappend encInvalidBytes {*}{
+}; # iso8859-13
+
+# iso8859-13 - invalid byte sequences
+lappend encUnencodableStrings {*}{
+    iso8859-13 \U000000A1 tcl8    1A -1 {} {}
+    iso8859-13 \U000000A1 replace 1A -1 {} {}
+    iso8859-13 \U000000A1 strict  {}                      0 {} {}
+    iso8859-13 \U00000400 tcl8    1A -1 {} {}
+    iso8859-13 \U00000400 replace 1A -1 {} {}
+    iso8859-13 \U00000400 strict  {}                      0 {} {}
+    iso8859-13 \U0000D800 tcl8    1A -1 {} {}
+    iso8859-13 \U0000D800 replace 1A -1 {} {}
+    iso8859-13 \U0000D800 strict  {}                      0 {} {}
+    iso8859-13 \U0000DC00 tcl8    1A -1 {} {}
+    iso8859-13 \U0000DC00 replace 1A -1 {} {}
+    iso8859-13 \U0000DC00 strict  {}                      0 {} {}
+    iso8859-13 \U00010000 tcl8    1A -1 {} {}
+    iso8859-13 \U00010000 replace 1A -1 {} {}
+    iso8859-13 \U00010000 strict  {}                      0 {} {}
+    iso8859-13 \U0010FFFF tcl8    1A -1 {} {}
+    iso8859-13 \U0010FFFF replace 1A -1 {} {}
+    iso8859-13 \U0010FFFF strict  {}                      0 {} {}
+}; # iso8859-13
+
+#
+# iso8859-14 (generated from glibc-ISO_8859_14-2.1.2)
+
+test encoding-convertfrom-ucmCompare-iso8859-14 {Compare against ICU UCM} -body {
+    ucmConvertfromMismatches iso8859-14 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A3 A3 00A7 A7 00A9 A9 00AD AD 00AE AE 00B6 B6 00C0 C0 00C1 C1 00C2 C2 00C3 C3 00C4 C4 00C5 C5 00C6 C6 00C7 C7 00C8 C8 00C9 C9 00CA CA 00CB CB 00CC CC 00CD CD 00CE CE 00CF CF 00D1 D1 00D2 D2 00D3 D3 00D4 D4 00D5 D5 00D6 D6 00D8 D8 00D9 D9 00DA DA 00DB DB 00DC DC 00DD DD 00DF DF 00E0 E0 00E1 E1 00E2 E2 00E3 E3 00E4 E4 00E5 E5 00E6 E6 00E7 E7 00E8 E8 00E9 E9 00EA EA 00EB EB 00EC EC 00ED ED 00EE EE 00EF EF 00F1 F1 00F2 F2 00F3 F3 00F4 F4 00F5 F5 00F6 F6 00F8 F8 00F9 F9 00FA FA 00FB FB 00FC FC 00FD FD 00FF FF 010A A4 010B A5 0120 B2 0121 B3 0174 D0 0175 F0 0176 DE 0177 FE 0178 AF 1E02 A1 1E03 A2 1E0A A6 1E0B AB 1E1E B0 1E1F B1 1E40 B4 1E41 B5 1E56 B7 1E57 B9 1E60 BB 1E61 BF 1E6A D7 1E6B F7 1E80 A8 1E81 B8 1E82 AA 1E83 BA 1E84 BD 1E85 BE 1EF2 AC 1EF3 BC}
+} -result {}
+
+test encoding-convertto-ucmCompare-iso8859-14 {Compare against ICU UCM} -body {
+    ucmConverttoMismatches iso8859-14 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A3 A3 00A7 A7 00A9 A9 00AD AD 00AE AE 00B6 B6 00C0 C0 00C1 C1 00C2 C2 00C3 C3 00C4 C4 00C5 C5 00C6 C6 00C7 C7 00C8 C8 00C9 C9 00CA CA 00CB CB 00CC CC 00CD CD 00CE CE 00CF CF 00D1 D1 00D2 D2 00D3 D3 00D4 D4 00D5 D5 00D6 D6 00D8 D8 00D9 D9 00DA DA 00DB DB 00DC DC 00DD DD 00DF DF 00E0 E0 00E1 E1 00E2 E2 00E3 E3 00E4 E4 00E5 E5 00E6 E6 00E7 E7 00E8 E8 00E9 E9 00EA EA 00EB EB 00EC EC 00ED ED 00EE EE 00EF EF 00F1 F1 00F2 F2 00F3 F3 00F4 F4 00F5 F5 00F6 F6 00F8 F8 00F9 F9 00FA FA 00FB FB 00FC FC 00FD FD 00FF FF 010A A4 010B A5 0120 B2 0121 B3 0174 D0 0175 F0 0176 DE 0177 FE 0178 AF 1E02 A1 1E03 A2 1E0A A6 1E0B AB 1E1E B0 1E1F B1 1E40 B4 1E41 B5 1E56 B7 1E57 B9 1E60 BB 1E61 BF 1E6A D7 1E6B F7 1E80 A8 1E81 B8 1E82 AA 1E83 BA 1E84 BD 1E85 BE 1EF2 AC 1EF3 BC}
+} -result {}
+
+# iso8859-14 - invalid byte sequences
+lappend encInvalidBytes {*}{
+}; # iso8859-14
+
+# iso8859-14 - invalid byte sequences
+lappend encUnencodableStrings {*}{
+    iso8859-14 \U000000A1 tcl8    1A -1 {} {}
+    iso8859-14 \U000000A1 replace 1A -1 {} {}
+    iso8859-14 \U000000A1 strict  {}                      0 {} {}
+    iso8859-14 \U00000400 tcl8    1A -1 {} {}
+    iso8859-14 \U00000400 replace 1A -1 {} {}
+    iso8859-14 \U00000400 strict  {}                      0 {} {}
+    iso8859-14 \U0000D800 tcl8    1A -1 {} {}
+    iso8859-14 \U0000D800 replace 1A -1 {} {}
+    iso8859-14 \U0000D800 strict  {}                      0 {} {}
+    iso8859-14 \U0000DC00 tcl8    1A -1 {} {}
+    iso8859-14 \U0000DC00 replace 1A -1 {} {}
+    iso8859-14 \U0000DC00 strict  {}                      0 {} {}
+    iso8859-14 \U00010000 tcl8    1A -1 {} {}
+    iso8859-14 \U00010000 replace 1A -1 {} {}
+    iso8859-14 \U00010000 strict  {}                      0 {} {}
+    iso8859-14 \U0010FFFF tcl8    1A -1 {} {}
+    iso8859-14 \U0010FFFF replace 1A -1 {} {}
+    iso8859-14 \U0010FFFF strict  {}                      0 {} {}
+}; # iso8859-14
+
+#
+# iso8859-15 (generated from glibc-ISO_8859_15-2.1.2)
+
+test encoding-convertfrom-ucmCompare-iso8859-15 {Compare against ICU UCM} -body {
+    ucmConvertfromMismatches iso8859-15 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A1 A1 00A2 A2 00A3 A3 00A5 A5 00A7 A7 00A9 A9 00AA AA 00AB AB 00AC AC 00AD AD 00AE AE 00AF AF 00B0 B0 00B1 B1 00B2 B2 00B3 B3 00B5 B5 00B6 B6 00B7 B7 00B9 B9 00BA BA 00BB BB 00BF BF 00C0 C0 00C1 C1 00C2 C2 00C3 C3 00C4 C4 00C5 C5 00C6 C6 00C7 C7 00C8 C8 00C9 C9 00CA CA 00CB CB 00CC CC 00CD CD 00CE CE 00CF CF 00D0 D0 00D1 D1 00D2 D2 00D3 D3 00D4 D4 00D5 D5 00D6 D6 00D7 D7 00D8 D8 00D9 D9 00DA DA 00DB DB 00DC DC 00DD DD 00DE DE 00DF DF 00E0 E0 00E1 E1 00E2 E2 00E3 E3 00E4 E4 00E5 E5 00E6 E6 00E7 E7 00E8 E8 00E9 E9 00EA EA 00EB EB 00EC EC 00ED ED 00EE EE 00EF EF 00F0 F0 00F1 F1 00F2 F2 00F3 F3 00F4 F4 00F5 F5 00F6 F6 00F7 F7 00F8 F8 00F9 F9 00FA FA 00FB FB 00FC FC 00FD FD 00FE FE 00FF FF 0152 BC 0153 BD 0160 A6 0161 A8 0178 BE 017D B4 017E B8 20AC A4}
+} -result {}
+
+test encoding-convertto-ucmCompare-iso8859-15 {Compare against ICU UCM} -body {
+    ucmConverttoMismatches iso8859-15 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A1 A1 00A2 A2 00A3 A3 00A5 A5 00A7 A7 00A9 A9 00AA AA 00AB AB 00AC AC 00AD AD 00AE AE 00AF AF 00B0 B0 00B1 B1 00B2 B2 00B3 B3 00B5 B5 00B6 B6 00B7 B7 00B9 B9 00BA BA 00BB BB 00BF BF 00C0 C0 00C1 C1 00C2 C2 00C3 C3 00C4 C4 00C5 C5 00C6 C6 00C7 C7 00C8 C8 00C9 C9 00CA CA 00CB CB 00CC CC 00CD CD 00CE CE 00CF CF 00D0 D0 00D1 D1 00D2 D2 00D3 D3 00D4 D4 00D5 D5 00D6 D6 00D7 D7 00D8 D8 00D9 D9 00DA DA 00DB DB 00DC DC 00DD DD 00DE DE 00DF DF 00E0 E0 00E1 E1 00E2 E2 00E3 E3 00E4 E4 00E5 E5 00E6 E6 00E7 E7 00E8 E8 00E9 E9 00EA EA 00EB EB 00EC EC 00ED ED 00EE EE 00EF EF 00F0 F0 00F1 F1 00F2 F2 00F3 F3 00F4 F4 00F5 F5 00F6 F6 00F7 F7 00F8 F8 00F9 F9 00FA FA 00FB FB 00FC FC 00FD FD 00FE FE 00FF FF 0152 BC 0153 BD 0160 A6 0161 A8 0178 BE 017D B4 017E B8 20AC A4}
+} -result {}
+
+# iso8859-15 - invalid byte sequences
+lappend encInvalidBytes {*}{
+}; # iso8859-15
+
+# iso8859-15 - invalid byte sequences
+lappend encUnencodableStrings {*}{
+    iso8859-15 \U000000A4 tcl8    1A -1 {} {}
+    iso8859-15 \U000000A4 replace 1A -1 {} {}
+    iso8859-15 \U000000A4 strict  {}                      0 {} {}
+    iso8859-15 \U00000400 tcl8    1A -1 {} {}
+    iso8859-15 \U00000400 replace 1A -1 {} {}
+    iso8859-15 \U00000400 strict  {}                      0 {} {}
+    iso8859-15 \U0000D800 tcl8    1A -1 {} {}
+    iso8859-15 \U0000D800 replace 1A -1 {} {}
+    iso8859-15 \U0000D800 strict  {}                      0 {} {}
+    iso8859-15 \U0000DC00 tcl8    1A -1 {} {}
+    iso8859-15 \U0000DC00 replace 1A -1 {} {}
+    iso8859-15 \U0000DC00 strict  {}                      0 {} {}
+    iso8859-15 \U00010000 tcl8    1A -1 {} {}
+    iso8859-15 \U00010000 replace 1A -1 {} {}
+    iso8859-15 \U00010000 strict  {}                      0 {} {}
+    iso8859-15 \U0010FFFF tcl8    1A -1 {} {}
+    iso8859-15 \U0010FFFF replace 1A -1 {} {}
+    iso8859-15 \U0010FFFF strict  {}                      0 {} {}
+}; # iso8859-15
+
+#
+# iso8859-16 (generated from glibc-ISO_8859_16-2.3.3)
+
+test encoding-convertfrom-ucmCompare-iso8859-16 {Compare against ICU UCM} -body {
+    ucmConvertfromMismatches iso8859-16 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A7 A7 00A9 A9 00AB AB 00AD AD 00B0 B0 00B1 B1 00B6 B6 00B7 B7 00BB BB 00C0 C0 00C1 C1 00C2 C2 00C4 C4 00C6 C6 00C7 C7 00C8 C8 00C9 C9 00CA CA 00CB CB 00CC CC 00CD CD 00CE CE 00CF CF 00D2 D2 00D3 D3 00D4 D4 00D6 D6 00D9 D9 00DA DA 00DB DB 00DC DC 00DF DF 00E0 E0 00E1 E1 00E2 E2 00E4 E4 00E6 E6 00E7 E7 00E8 E8 00E9 E9 00EA EA 00EB EB 00EC EC 00ED ED 00EE EE 00EF EF 00F2 F2 00F3 F3 00F4 F4 00F6 F6 00F9 F9 00FA FA 00FB FB 00FC FC 00FF FF 0102 C3 0103 E3 0104 A1 0105 A2 0106 C5 0107 E5 010C B2 010D B9 0110 D0 0111 F0 0118 DD 0119 FD 0141 A3 0142 B3 0143 D1 0144 F1 0150 D5 0151 F5 0152 BC 0153 BD 015A D7 015B F7 0160 A6 0161 A8 0170 D8 0171 F8 0178 BE 0179 AC 017A AE 017B AF 017C BF 017D B4 017E B8 0218 AA 0219 BA 021A DE 021B FE 201D B5 201E A5 20AC A4}
+} -result {}
+
+test encoding-convertto-ucmCompare-iso8859-16 {Compare against ICU UCM} -body {
+    ucmConverttoMismatches iso8859-16 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A7 A7 00A9 A9 00AB AB 00AD AD 00B0 B0 00B1 B1 00B6 B6 00B7 B7 00BB BB 00C0 C0 00C1 C1 00C2 C2 00C4 C4 00C6 C6 00C7 C7 00C8 C8 00C9 C9 00CA CA 00CB CB 00CC CC 00CD CD 00CE CE 00CF CF 00D2 D2 00D3 D3 00D4 D4 00D6 D6 00D9 D9 00DA DA 00DB DB 00DC DC 00DF DF 00E0 E0 00E1 E1 00E2 E2 00E4 E4 00E6 E6 00E7 E7 00E8 E8 00E9 E9 00EA EA 00EB EB 00EC EC 00ED ED 00EE EE 00EF EF 00F2 F2 00F3 F3 00F4 F4 00F6 F6 00F9 F9 00FA FA 00FB FB 00FC FC 00FF FF 0102 C3 0103 E3 0104 A1 0105 A2 0106 C5 0107 E5 010C B2 010D B9 0110 D0 0111 F0 0118 DD 0119 FD 0141 A3 0142 B3 0143 D1 0144 F1 0150 D5 0151 F5 0152 BC 0153 BD 015A D7 015B F7 0160 A6 0161 A8 0170 D8 0171 F8 0178 BE 0179 AC 017A AE 017B AF 017C BF 017D B4 017E B8 0218 AA 0219 BA 021A DE 021B FE 201D B5 201E A5 20AC A4}
+} -result {}
+
+# iso8859-16 - invalid byte sequences
+lappend encInvalidBytes {*}{
+}; # iso8859-16
+
+# iso8859-16 - invalid byte sequences
+lappend encUnencodableStrings {*}{
+    iso8859-16 \U000000A1 tcl8    1A -1 {} {}
+    iso8859-16 \U000000A1 replace 1A -1 {} {}
+    iso8859-16 \U000000A1 strict  {}                      0 {} {}
+    iso8859-16 \U00000400 tcl8    1A -1 {} {}
+    iso8859-16 \U00000400 replace 1A -1 {} {}
+    iso8859-16 \U00000400 strict  {}                      0 {} {}
+    iso8859-16 \U0000D800 tcl8    1A -1 {} {}
+    iso8859-16 \U0000D800 replace 1A -1 {} {}
+    iso8859-16 \U0000D800 strict  {}                      0 {} {}
+    iso8859-16 \U0000DC00 tcl8    1A -1 {} {}
+    iso8859-16 \U0000DC00 replace 1A -1 {} {}
+    iso8859-16 \U0000DC00 strict  {}                      0 {} {}
+    iso8859-16 \U00010000 tcl8    1A -1 {} {}
+    iso8859-16 \U00010000 replace 1A -1 {} {}
+    iso8859-16 \U00010000 strict  {}                      0 {} {}
+    iso8859-16 \U0010FFFF tcl8    1A -1 {} {}
+    iso8859-16 \U0010FFFF replace 1A -1 {} {}
+    iso8859-16 \U0010FFFF strict  {}                      0 {} {}
+}; # iso8859-16
diff --git a/tests/io.test b/tests/io.test
index fa4ade1..96e5ea6 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -339,7 +339,7 @@ test io-3.4 {WriteChars: loop over stage buffer} -body {
     # stage buffer maps to more than can be queued at once.
 
     set f [open $path(test1) w]
-    fconfigure $f -encoding jis0208 -buffersize 16 -nocomplainencoding 1
+    fconfigure $f -encoding jis0208 -buffersize 16 -profile tcl8
     puts -nonewline $f "\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
     set x [list [contents $path(test1)]]
     close $f
@@ -353,7 +353,7 @@ test io-3.5 {WriteChars: saved != 0} -body {
     # requested buffersize.
 
     set f [open $path(test1) w]
-    fconfigure $f -encoding jis0208 -buffersize 17 -nocomplainencoding 1
+    fconfigure $f -encoding jis0208 -buffersize 17 -profile tcl8
     puts -nonewline $f "\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
     set x [list [contents $path(test1)]]
     close $f
@@ -386,7 +386,7 @@ test io-3.7 {WriteChars: (bufPtr->nextAdded > bufPtr->length)} -body {
     # of the next channel buffer.
 
     set f [open $path(test1) w]
-    fconfigure $f -encoding jis0208 -buffersize 17 -nocomplainencoding 1
+    fconfigure $f -encoding jis0208 -buffersize 17 -profile tcl8
     puts -nonewline $f "\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
     set x [list [contents $path(test1)]]
     close $f
@@ -5541,7 +5541,7 @@ test io-38.3 {Tcl_SetChannelBufferSize, changing buffersize between reads} {
     # This test crashes the interp if Bug #427196 is not fixed
 
     set chan [open [info script] r]
-    fconfigure $chan -buffersize 10
+    fconfigure $chan -buffersize 10 -encoding utf-8
     set var [read $chan 2]
     fconfigure $chan -buffersize 32
     append var [read $chan]
@@ -5742,13 +5742,20 @@ test io-39.15 {Tcl_SetChannelOption: -encoding, binary & utf-8} {
     close $f
     set x
 } 牦
-test io-39.16 {Tcl_SetChannelOption: -encoding, errors} {
+test io-39.16 {Tcl_SetChannelOption: -encoding (shortened to "-en"), errors} -body {
     file delete $path(test1)
     set f [open $path(test1) w]
-    set result [list [catch {fconfigure $f -encoding foobar} msg] $msg]
+    fconfigure $f -en foobar
+} -cleanup {
     close $f
-    set result
-} {1 {unknown encoding "foobar"}}
+} -returnCodes 1 -result {unknown encoding "foobar"}
+test io-39.16a {Tcl_SetChannelOption: -encoding (invalid shortening to "-e"), errors} -body {
+    file delete $path(test1)
+    set f [open $path(test1) w]
+    fconfigure $f -e foobar
+} -cleanup {
+    close $f
+} -returnCodes 1 -match glob -result {bad option "-e": should be one of *}
 test io-39.17 {Tcl_SetChannelOption: -encoding, clearing CHANNEL_NEED_MORE_DATA} {stdio fileevent} {
     set f [open "|[list [interpreter] $path(cat)]" r+]
     fconfigure $f -encoding binary
@@ -7689,14 +7696,14 @@ test io-52.20 {TclCopyChannel & encodings} -setup {
     set out [open $path(kyrillic.txt) w]
 
     # Using "-encoding ascii" means reading the "Á" gives an error
-    fconfigure $in  -encoding ascii -strictencoding 1
+    fconfigure $in  -encoding ascii -profile strict
     fconfigure $out -encoding koi8-r -translation lf
 
     fcopy $in $out
 } -cleanup {
     close $in
     close $out
-} -returnCodes 1 -match glob -result {error reading "file*": illegal byte sequence}
+} -returnCodes 1 -match glob -result {error reading "file*": invalid or incomplete multibyte or wide character}
 test io-52.21 {TclCopyChannel & encodings} -setup {
     set out [open $path(utf8-fcopy.txt) w]
     fconfigure $out -encoding utf-8 -translation lf
@@ -7711,13 +7718,13 @@ test io-52.21 {TclCopyChannel & encodings} -setup {
 
     # Using "-encoding ascii" means writing the "Á" gives an error
     fconfigure $in  -encoding utf-8
-    fconfigure $out -encoding ascii -translation lf -strictencoding 1
+    fconfigure $out -encoding ascii -translation lf -profile strict
 
     fcopy $in $out
 } -cleanup {
     close $in
     close $out
-} -returnCodes 1 -match glob -result {error writing "file*": illegal byte sequence}
+} -returnCodes 1 -match glob -result {error writing "file*": invalid or incomplete multibyte or wide character}
 test io-52.22 {TclCopyChannel & encodings} -setup {
     set out [open $path(utf8-fcopy.txt) w]
     fconfigure $out -encoding utf-8 -translation lf
@@ -7731,7 +7738,7 @@ test io-52.22 {TclCopyChannel & encodings} -setup {
     set out [open $path(kyrillic.txt) w]
 
     # Using "-encoding ascii" means reading the "Á" gives an error
-    fconfigure $in  -encoding ascii -strictencoding 1
+    fconfigure $in  -encoding ascii -profile strict
     fconfigure $out -encoding koi8-r -translation lf
     proc ::xxx args {
         set ::s0 $args
@@ -7744,7 +7751,7 @@ test io-52.22 {TclCopyChannel & encodings} -setup {
     close $in
     close $out
     unset ::s0
-} -match glob -result {0 {error reading "file*": illegal byte sequence}}
+} -match glob -result {0 {error reading "file*": invalid or incomplete multibyte or wide character}}
 test io-52.23 {TclCopyChannel & encodings} -setup {
     set out [open $path(utf8-fcopy.txt) w]
     fconfigure $out -encoding utf-8 -translation lf
@@ -7759,7 +7766,7 @@ test io-52.23 {TclCopyChannel & encodings} -setup {
 
     # Using "-encoding ascii" means writing the "Á" gives an error
     fconfigure $in  -encoding utf-8
-    fconfigure $out -encoding ascii -translation lf -strictencoding 1
+    fconfigure $out -encoding ascii -translation lf -profile strict
     proc ::xxx args {
         set ::s0 $args
     }
@@ -7771,7 +7778,7 @@ test io-52.23 {TclCopyChannel & encodings} -setup {
     close $in
     close $out
     unset ::s0
-} -match glob -result {0 {error writing "file*": illegal byte sequence}}
+} -match glob -result {0 {error writing "file*": invalid or incomplete multibyte or wide character}}
 
 
 test io-53.1 {CopyData} {fcopy} {
@@ -8754,7 +8761,7 @@ test io-60.1 {writing illegal utf sequences} {fileevent testbytestring} {
     # cut of the remainder of the error stack, especially the filename
     set result [lreplace $result 3 3 [lindex [split [lindex $result 3] \n] 0]]
     list $x $result
-} {1 {gets ABC catch {error writing "stdout": illegal byte sequence}}}
+} {1 {gets ABC catch {error writing "stdout": invalid or incomplete multibyte or wide character}}}
 
 test io-61.1 {Reset eof state after changing the eof char} -setup {
     set datafile [makeFile {} eofchar]
@@ -9125,7 +9132,7 @@ test io-75.1 {multibyte encoding error read results in raw bytes (-nocomplainenc
     puts -nonewline $f A\xC0\x40
     flush $f
     seek $f 0
-    fconfigure $f -encoding utf-8 -nocomplainencoding 1 -buffering none
+    fconfigure $f -encoding utf-8 -profile tcl8 -buffering none
 } -body {
     set d [read $f]
     binary scan $d H* hd
@@ -9135,10 +9142,10 @@ test io-75.1 {multibyte encoding error read results in raw bytes (-nocomplainenc
     removeFile io-75.1
 } -result 41c040
 
-test io-75.2 {unrepresentable character write passes and is replaced by ? (-nocomplainencoding 1)} -setup {
+test io-75.2 {unrepresentable character write passes and is replaced by ? (-profile tcl8)} -setup {
     set fn [makeFile {} io-75.2]
     set f [open $fn w+]
-    fconfigure $f -encoding iso8859-1 -nocomplainencoding 1
+    fconfigure $f -encoding iso8859-1 -profile tcl8
 } -body {
     puts -nonewline $f A\u2022
     flush $f
@@ -9152,26 +9159,26 @@ test io-75.2 {unrepresentable character write passes and is replaced by ? (-noco
 # Incomplete sequence test.
 # This error may IMHO only be detected with the close.
 # But the read already returns the incomplete sequence.
-test io-75.3 {incomplete multibyte encoding read is ignored (-nocomplainencoding 1)} -setup {
+test io-75.3 {incomplete multibyte encoding read is ignored (-profile tcl8)} -setup {
     set fn [makeFile {} io-75.3]
     set f [open $fn w+]
     fconfigure $f -encoding binary
     puts -nonewline $f "A\xC0"
     flush $f
     seek $f 0
-    fconfigure $f -encoding utf-8 -buffering none -nocomplainencoding 1
+    fconfigure $f -encoding utf-8 -buffering none -profile tcl8
 } -body {
     set d [read $f]
-    close $f
     binary scan $d H* hd
     set hd
 } -cleanup {
+    close $f
     removeFile io-75.3
 } -result 41c0
 
 # As utf-8 has a special treatment in multi-byte decoding, also test another
 # one.
-test io-75.4 {shiftjis encoding error read results in raw bytes (-nocomplainencoding 1)} -setup {
+test io-75.4 {shiftjis encoding error read results in raw bytes (-profile tcl8)} -setup {
     set fn [makeFile {} io-75.4]
     set f [open $fn w+]
     fconfigure $f -encoding binary
@@ -9180,7 +9187,7 @@ test io-75.4 {shiftjis encoding error read results in raw bytes (-nocomplainenco
     puts -nonewline $f A\x81\xFFA
     flush $f
     seek $f 0
-    fconfigure $f -encoding shiftjis -buffering none -eofchar "" -translation lf -nocomplainencoding 1
+    fconfigure $f -encoding shiftjis -buffering none -eofchar "" -translation lf -profile tcl8
 } -body {
     set d [read $f]
     binary scan $d H* hd
@@ -9190,24 +9197,56 @@ test io-75.4 {shiftjis encoding error read results in raw bytes (-nocomplainenco
     removeFile io-75.4
 } -result 4181ff41
 
-test io-75.5 {invalid utf-8 encoding read is ignored (-nocomplainencoding 1)} -setup {
+test io-75.5 {invalid utf-8 encoding read is ignored (-profile tcl8)} -setup {
     set fn [makeFile {} io-75.5]
     set f [open $fn w+]
     fconfigure $f -encoding binary
     puts -nonewline $f A\x81
     flush $f
     seek $f 0
-    fconfigure $f -encoding utf-8 -buffering none -eofchar "" -translation lf -nocomplainencoding 1
+    fconfigure $f -encoding utf-8 -buffering none -eofchar "" -translation lf -profile tcl8
 } -body {
     set d [read $f]
-    close $f
     binary scan $d H* hd
     set hd
 } -cleanup {
+    close $f
     removeFile io-75.5
 } -result 4181
 
-test io-75.8 {invalid utf-8 encoding eof handling (-strictencoding 1)} -setup {
+test io-75.6 {invalid utf-8 encoding gets is not ignored (-profile strict)} -setup {
+    set fn [makeFile {} io-75.6]
+    set f [open $fn w+]
+    fconfigure $f -encoding binary
+    # \x81 is invalid in utf-8
+    puts -nonewline $f A\x81
+    flush $f
+    seek $f 0
+    fconfigure $f -encoding utf-8 -buffering none -eofchar "" -translation lf -profile strict
+} -body {
+    gets $f
+} -cleanup {
+    close $f
+    removeFile io-75.6
+} -match glob -returnCodes 1 -result {error reading "*": invalid or incomplete multibyte or wide character}
+
+test io-75.7 {invalid utf-8 encoding gets is not ignored (-profile strict)} -setup {
+    set fn [makeFile {} io-75.7]
+    set f [open $fn w+]
+    fconfigure $f -encoding binary
+    # \x81 is invalid in utf-8
+    puts -nonewline $f A\x81
+    flush $f
+    seek $f 0
+    fconfigure $f -encoding utf-8 -buffering none -eofchar "" -translation lf -profile strict
+} -body {
+    read $f
+} -cleanup {
+    close $f
+    removeFile io-75.7
+} -match glob -returnCodes 1 -result {error reading "*": invalid or incomplete multibyte or wide character}
+
+test io-75.8 {invalid utf-8 encoding eof handling (-profile strict)} -setup {
     set fn [makeFile {} io-75.8]
     set f [open $fn w+]
     fconfigure $f -encoding binary
@@ -9215,7 +9254,7 @@ test io-75.8 {invalid utf-8 encoding eof handling (-strictencoding 1)} -setup {
     puts -nonewline $f A\x1A\x81
     flush $f
     seek $f 0
-    fconfigure $f -encoding utf-8 -buffering none -eofchar \x1A -translation lf -strictencoding 1
+    fconfigure $f -encoding utf-8 -buffering none -eofchar \x1A -translation lf -profile strict
 } -body {
     set d [read $f]
     binary scan $d H* hd
@@ -9230,7 +9269,7 @@ test io-75.8 {invalid utf-8 encoding eof handling (-strictencoding 1)} -setup {
 test io-75.9 {unrepresentable character write passes and is replaced by ?} -setup {
     set fn [makeFile {} io-75.9]
     set f [open $fn w+]
-    fconfigure $f -encoding iso8859-1 -strictencoding 1
+    fconfigure $f -encoding iso8859-1 -profile strict
 } -body {
     catch {puts -nonewline $f "A\u2022"} msg
     flush $f
@@ -9239,7 +9278,7 @@ test io-75.9 {unrepresentable character write passes and is replaced by ?} -setu
 } -cleanup {
     close $f
     removeFile io-75.9
-} -match glob -result [list {A} {error writing "*": illegal byte sequence}]
+} -match glob -result [list {A} {error writing "*": invalid or incomplete multibyte or wide character}]
 
 # Incomplete sequence test.
 # This error may IMHO only be detected with the close.
@@ -9254,10 +9293,10 @@ test io-75.10 {incomplete multibyte encoding read is ignored} -setup {
     fconfigure $f -encoding utf-8 -buffering none
 } -body {
     set d [read $f]
-    close $f
     binary scan $d H* hd
     set hd
 } -cleanup {
+    close $f
     removeFile io-75.10
 } -result 41c0
 # The current result returns the orphan byte as byte.
@@ -9274,7 +9313,7 @@ test io-75.11 {shiftjis encoding error read results in raw bytes} -setup {
     puts -nonewline $f A\x81\xFFA
     flush $f
     seek $f 0
-    fconfigure $f -encoding shiftjis -buffering none -eofchar "" -translation lf -strictencoding 1
+    fconfigure $f -encoding shiftjis -blocking 0 -eofchar "" -translation lf -profile strict
 } -body {
     set d [read $f]
     binary scan $d H* hd
@@ -9283,7 +9322,7 @@ test io-75.11 {shiftjis encoding error read results in raw bytes} -setup {
 } -cleanup {
     close $f
     removeFile io-75.11
-} -match glob -result {41 1 {error reading "*": illegal byte sequence}}
+} -match glob -result {41 1 {error reading "*": invalid or incomplete multibyte or wide character}}
 
 test io-75.12 {invalid utf-8 encoding read is ignored} -setup {
     set fn [makeFile {} io-75.12]
@@ -9295,13 +9334,13 @@ test io-75.12 {invalid utf-8 encoding read is ignored} -setup {
     fconfigure $f -encoding utf-8 -buffering none -eofchar "" -translation lf
 } -body {
     set d [read $f]
-    close $f
     binary scan $d H* hd
     set hd
 } -cleanup {
+    close $f
     removeFile io-75.12
 } -result 4181
-test io-75.13 {invalid utf-8 encoding read is not ignored (-strictencoding 1)} -setup {
+test io-75.13 {invalid utf-8 encoding read is not ignored (-profile strict)} -setup {
     set fn [makeFile {} io-75.13]
     set f [open $fn w+]
     fconfigure $f -encoding binary
@@ -9309,16 +9348,16 @@ test io-75.13 {invalid utf-8 encoding read is not ignored (-strictencoding 1)} -
     puts -nonewline $f "A\x81"
     flush $f
     seek $f 0
-    fconfigure $f -encoding utf-8 -buffering none -eofchar "" -translation lf -strictencoding 1
+    fconfigure $f -encoding utf-8 -blocking 0 -eofchar "" -translation lf -profile strict
 } -body {
     set d [read $f]
     binary scan $d H* hd
     lappend hd [catch {read $f} msg]
-    close $f
     lappend hd $msg
 } -cleanup {
+    close $f
     removeFile io-75.13
-} -match glob -result {41 1 {error reading "*": illegal byte sequence}}
+} -match glob -result {41 1 {error reading "*": invalid or incomplete multibyte or wide character}}
 
 # ### ### ### ######### ######### #########
 
diff --git a/tests/ioCmd.test b/tests/ioCmd.test
index 41abfb9..cab4745 100644
--- a/tests/ioCmd.test
+++ b/tests/ioCmd.test
@@ -207,7 +207,7 @@ test iocmd-7.5 {close command} -setup {
 
 proc expectedOpts {got extra} {
     set basicOpts {
-	-blocking -buffering -buffersize -encoding -eofchar -nocomplainencoding -strictencoding -translation
+	-blocking -buffering -buffersize -encoding -eofchar -profile -translation
     }
     set opts [list {*}$basicOpts {*}$extra]
     lset opts end [string cat "or " [lindex $opts end]]
@@ -240,33 +240,33 @@ test iocmd-8.7 {fconfigure command} -setup {
     file delete $path(test1)
 } -body {
     set f1 [open $path(test1) w]
-    fconfigure $f1 -translation lf -eofchar {} -encoding utf-16
+    fconfigure $f1 -translation lf -eofchar {} -encoding utf-16 -profile tcl8
     fconfigure $f1
 } -cleanup {
     catch {close $f1}
-} -result {-blocking 1 -buffering full -buffersize 4096 -encoding utf-16 -eofchar {} -nocomplainencoding 0 -strictencoding 0 -translation lf}
+} -result {-blocking 1 -buffering full -buffersize 4096 -encoding utf-16 -eofchar {} -profile tcl8 -translation lf}
 test iocmd-8.8 {fconfigure command} -setup {
     file delete $path(test1)
     set x {}
 } -body {
     set f1 [open $path(test1) w]
     fconfigure $f1 -translation lf -buffering line -buffersize 3030 \
-		-eofchar {} -encoding utf-16
+		-eofchar {} -encoding utf-16 -profile tcl8
     lappend x [fconfigure $f1 -buffering]
     lappend x [fconfigure $f1]
 } -cleanup {
     catch {close $f1}
-} -result {line {-blocking 1 -buffering line -buffersize 3030 -encoding utf-16 -eofchar {} -nocomplainencoding 0 -strictencoding 0 -translation lf}}
+} -result {line {-blocking 1 -buffering line -buffersize 3030 -encoding utf-16 -eofchar {} -profile tcl8 -translation lf}}
 test iocmd-8.9 {fconfigure command} -setup {
     file delete $path(test1)
 } -body {
     set f1 [open $path(test1) w]
     fconfigure $f1 -translation binary -buffering none -buffersize 4040 \
-		-eofchar {} -encoding binary
+		-eofchar {} -encoding binary -profile tcl8
     fconfigure $f1
 } -cleanup {
     catch {close $f1}
-} -result {-blocking 1 -buffering none -buffersize 4040 -encoding binary -eofchar {} -nocomplainencoding 0 -strictencoding 0 -translation lf}
+} -result {-blocking 1 -buffering none -buffersize 4040 -encoding binary -eofchar {} -profile tcl8 -translation lf}
 test iocmd-8.10 {fconfigure command} -returnCodes error -body {
     fconfigure a b
 } -result {can not find channel named "a"}
@@ -369,6 +369,10 @@ test iocmd-8.20 {fconfigure command / win console channel} -constraints {nonPort
 # TODO: Test parsing of serial channel options (nonPortable, since requires an
 # open channel to work with).
 
+test iocmd-8.23 {fconfigure -profile badprofile} -body {
+    fconfigure stdin -profile froboz
+} -returnCodes error -result {bad profile name "froboz": must be replace, strict, or tcl8}
+
 test iocmd-9.1 {eof command} {
     list [catch {eof} msg] $msg $::errorCode
 } {1 {wrong # args: should be "eof channelId"} {TCL WRONGARGS}}
@@ -496,7 +500,7 @@ test iocmd-12.11 {POSIX open access modes: BINARY} -body {
     puts $f Ɉ		;# throws an exception
 } -cleanup {
     close $f
-} -returnCodes 1 -match glob -result {error writing "*": illegal byte sequence}
+} -returnCodes 1 -match glob -result {error writing "*": invalid or incomplete multibyte or wide character}
 test iocmd-12.12 {POSIX open access modes: BINARY} {
     set f [open $path(test1) {WRONLY BINARY TRUNC}]
     puts $f H
@@ -694,12 +698,12 @@ test iocmd-21.1 {chan create, wrong#args, too many} {
     catch {chan create a b c} msg
     set msg
 } {wrong # args: should be "chan create mode cmdprefix"}
-test iocmd-21.2 {chan create, invalid r/w mode, empty} {
-    proc foo {} {}
-    catch {chan create {} foo} msg
+test iocmd-21.2 {chan create, r/w mode empty} {
+    proc foo {cmd args} { return {initialize finalize watch} }
+    set chan [chan create {} foo]
+    close $chan
     rename foo {}
-    set msg
-} {bad mode list: is empty}
+} {}
 test iocmd-21.3 {chan create, invalid r/w mode, bad string} {
     proc foo {} {}
     catch {chan create {c} foo} msg
@@ -1368,7 +1372,7 @@ test iocmd-25.1 {chan configure, cgetall, standard options} -match glob -body {
     close $c
     rename foo {}
     set res
-} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {} -nocomplainencoding 0 -strictencoding 0 -translation {auto *}}}
+} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {} -profile * -translation {auto *}}}
 test iocmd-25.2 {chan configure, cgetall, no options} -match glob -body {
     set res {}
     proc foo {args} {oninit cget cgetall; onfinal; track; return ""}
@@ -1377,7 +1381,7 @@ test iocmd-25.2 {chan configure, cgetall, no options} -match glob -body {
     close $c
     rename foo {}
     set res
-} -result {{cgetall rc*} {-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {} -nocomplainencoding 0 -strictencoding 0 -translation {auto *}}}
+} -result {{cgetall rc*} {-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {} -profile * -translation {auto *}}}
 test iocmd-25.3 {chan configure, cgetall, regular result} -match glob -body {
     set res {}
     proc foo {args} {
@@ -1389,7 +1393,7 @@ test iocmd-25.3 {chan configure, cgetall, regular result} -match glob -body {
     close $c
     rename foo {}
     set res
-} -result {{cgetall rc*} {-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {} -nocomplainencoding 0 -strictencoding 0 -translation {auto *} -bar foo -snarf x}}
+} -result {{cgetall rc*} {-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {} -profile * -translation {auto *} -bar foo -snarf x}}
 test iocmd-25.4 {chan configure, cgetall, bad result, list of uneven length} -match glob -body {
     set res {}
     proc foo {args} {
diff --git a/tests/ioTrans.test b/tests/ioTrans.test
index 79493e0..9f6542c 100644
--- a/tests/ioTrans.test
+++ b/tests/ioTrans.test
@@ -634,6 +634,61 @@ test iortrans-4.9 {chan read, gets, bug 2921116} -setup {
         }
     }
 
+
+
+namespace eval reflector {
+    proc initialize {_ chan mode} {
+	return {initialize finalize watch read}
+    }
+
+
+    proc finalize {_ chan} {
+	foreach id [after info] {
+	    after cancel $id
+	}
+	namespace delete $_
+    }
+
+
+    proc read {_ chan count} {
+	namespace upvar $_ source source
+	set res [string range $source 0 $count-1]
+	set source [string range $source $count end]
+	return $res
+    }
+
+
+    proc watch {_ chan events} {
+	after 0 [list chan postevent $chan read]
+	return read
+    }
+
+    namespace ensemble create -parameters _
+    namespace export *
+}
+
+
+
+
+namespace eval inputfilter {
+    proc initialize {chan mode} {
+	return {initialize finalize read}
+    }
+
+    proc read {chan buffer} {
+	return $buffer
+    }
+
+    proc finalize chan {
+	namespace delete $chan
+    }
+
+    namespace ensemble create
+    namespace export *
+}
+
+
+
 # Channel read transform that is just the identity - pass all through
     proc idxform {cmd handle args} {
       switch -- $cmd {
@@ -2089,7 +2144,39 @@ test iortrans.tf-11.1 {origin thread of moved transform destroyed during access}
     thread::release $tidb
 } -result {Owner lost}
 
-# ### ### ### ######### ######### #########
+
+test iortrans-ea69b0258a9833cb {
+    Crash when using a channel transformation on TCP client socket
+
+    "line two" does not make it into result.  This issue should probably be
+    addressed, but it is outside the scope of this test.
+} -setup {
+    set res {}
+    set read 0
+} -body {
+    namespace eval reflector1 {
+	variable source "line one\nline two"
+	interp alias {} [namespace current]::dispatch {} [
+	    namespace parent]::reflector [namespace current]
+    }
+    set chan [chan create read [namespace which reflector1::dispatch]]
+    chan configure $chan -blocking 0
+    chan push $chan inputfilter
+    chan event $chan read [list ::apply [list chan {
+	variable res
+	variable read
+	set gets [gets $chan]
+	append res $gets
+	incr read
+    } [namespace current]] $chan]
+    vwait [namespace current]::read
+    chan pop $chan
+    vwait [namespace current]::read
+    return $res
+} -cleanup {
+    catch {unset read}
+    close $chan
+} -result {line one}
 
 cleanupTests
 return
diff --git a/tests/iogt.test b/tests/iogt.test
index 279a0dd..d397ccb 100644
--- a/tests/iogt.test
+++ b/tests/iogt.test
@@ -575,11 +575,11 @@ read {%^&*()_+-=
 }
 query/maxRead {} -1
 flush/read {} {}
-query/maxRead {} -1
 write %^&*()_+-= %^&*()_+-=
 write {
 } {
 }
+query/maxRead {} -1
 delete/read {} *ignored*
 flush/write {} {}
 delete/write {} *ignored*}
diff --git a/tests/lseq.test b/tests/lseq.test
index 3f68da4..1dff72d 100644
--- a/tests/lseq.test
+++ b/tests/lseq.test
@@ -17,6 +17,7 @@ if {"::tcltest" ni [namespace children]} {
 testConstraint arithSeriesDouble 1
 testConstraint arithSeriesShimmer 1
 testConstraint arithSeriesShimmerOk 1
+testConstraint has64BitLengths [expr {$tcl_platform(pointerSize) == 8}]
 
 ## Arg errors
 test lseq-1.1 {error cases} -body {
@@ -482,7 +483,7 @@ test lseq-4.3 {TIP examples} {
 
 #
 # Ticket 9933cc4d88697f05976accebd31c1e3ba6efe9c6 - lseq corner case
-test lseq-4.4 {lseq corner case} -body {
+test lseq-4.4 {lseq corner case} -constraints has64BitLengths -body {
     set tcmd {
 	set res {}
 	set s [catch {lindex [lseq 10 100] 0} e]
@@ -506,6 +507,9 @@ test lseq-4.4 {lseq corner case} -body {
 test lseq-4.5 {lindex off by one} -body {
     lappend res [eval {lindex [lseq 1 4] end}]
     lappend res [eval {lindex [lseq 1 4] end-1}]
+} -setup {
+    # Since 4.3 does not clean up and 4.4 may not run under constraint
+    set res {}
 } -cleanup {
     unset res
 } -result {4 3}
diff --git a/tests/safe.test b/tests/safe.test
index 7b73eb2..d81da0a 100644
--- a/tests/safe.test
+++ b/tests/safe.test
@@ -1473,7 +1473,7 @@ test safe-11.7 {testing safe encoding} -setup {
     interp eval $i encoding convertfrom
 } -returnCodes error -cleanup {
     safe::interpDelete $i
-} -result {wrong # args: should be "encoding convertfrom ?-strict? ?-failindex var? ?encoding? data" or "encoding convertfrom -nocomplain ?encoding? data"}
+} -result {wrong # args: should be "encoding convertfrom ?-profile profile? ?-failindex var? encoding data" or "encoding convertfrom data"}
 test safe-11.7.1 {testing safe encoding} -setup {
     set i [safe::interpCreate]
 } -body {
@@ -1482,7 +1482,7 @@ test safe-11.7.1 {testing safe encoding} -setup {
 } -match glob -cleanup {
     unset -nocomplain m o
     safe::interpDelete $i
-} -result {wrong # args: should be "encoding convertfrom ?-strict? ?-failindex var? ?encoding? data" or "encoding convertfrom -nocomplain ?encoding? data"
+} -result {wrong # args: should be "encoding convertfrom ?-profile profile? ?-failindex var? encoding data" or "encoding convertfrom data"
     while executing
 "encoding convertfrom"
     invoked from within
@@ -1495,7 +1495,7 @@ test safe-11.8 {testing safe encoding} -setup {
     interp eval $i encoding convertto
 } -returnCodes error -cleanup {
     safe::interpDelete $i
-} -result {wrong # args: should be "encoding convertto ?-strict? ?-failindex var? ?encoding? data" or "encoding convertto -nocomplain ?encoding? data"}
+} -result {wrong # args: should be "encoding convertto ?-profile profile? ?-failindex var? encoding data" or "encoding convertto data"}
 test safe-11.8.1 {testing safe encoding} -setup {
     set i [safe::interpCreate]
 } -body {
@@ -1504,7 +1504,7 @@ test safe-11.8.1 {testing safe encoding} -setup {
 } -match glob -cleanup {
     unset -nocomplain m o
     safe::interpDelete $i
-} -result {wrong # args: should be "encoding convertto ?-strict? ?-failindex var? ?encoding? data" or "encoding convertto -nocomplain ?encoding? data"
+} -result {wrong # args: should be "encoding convertto ?-profile profile? ?-failindex var? encoding data" or "encoding convertto data"
     while executing
 "encoding convertto"
     invoked from within
diff --git a/tests/socket.test b/tests/socket.test
index a0fe2f7..052733f 100644
--- a/tests/socket.test
+++ b/tests/socket.test
@@ -1071,7 +1071,7 @@ test socket_$af-7.3 {testing socket specific options} -constraints [list socket
     close $s
     update
     llength $l
-} -result 22
+} -result 20
 test socket_$af-7.4 {testing socket specific options} -constraints [list socket supported_$af] -setup {
     set timer [after 10000 "set x timed_out"]
     set l ""
@@ -2226,7 +2226,7 @@ test socket-14.7.2 {pending [socket -async] and blocking [gets], no listener} \
         list $x [fconfigure $sock -error] [fconfigure $sock -error]
     } -cleanup {
         close $sock
-    } -match glob -result {{error reading "sock*": socket is not connected} {connection refused} {}}
+    } -match glob -result {{error reading "sock*": transport endpoint is not connected} {connection refused} {}}
 test socket-14.8.0 {pending [socket -async] and nonblocking [gets], server is IPv4} \
     -constraints {socket supported_inet localhost_v4} \
     -setup {
@@ -2291,7 +2291,7 @@ test socket-14.8.2 {pending [socket -async] and nonblocking [gets], no listener}
         list $x [fconfigure $sock -error] [fconfigure $sock -error]
     } -cleanup {
         close $sock
-    } -match glob -result {{error reading "sock*": socket is not connected} {connection refused} {}}
+    } -match glob -result {{error reading "sock*": transport endpoint is not connected} {connection refused} {}}
 test socket-14.9.0 {pending [socket -async] and blocking [puts], server is IPv4} \
     -constraints {socket supported_inet localhost_v4} \
     -setup {
@@ -2406,7 +2406,7 @@ test socket-14.11.0 {pending [socket -async] and nonblocking [puts], no listener
     } -cleanup {
         catch {close $sock}
         unset x
-    } -result {socket is not connected} -returnCodes 1
+    } -result {transport endpoint is not connected} -returnCodes 1
 test socket-14.11.1 {pending [socket -async] and nonblocking [puts], no listener, flush} \
     -constraints {socket testsocket_testflags} \
     -body {
@@ -2425,7 +2425,7 @@ test socket-14.11.1 {pending [socket -async] and nonblocking [puts], no listener
     } -cleanup {
         catch {close $sock}
         catch {unset x}
-    } -result {socket is not connected} -returnCodes 1
+    } -result {transport endpoint is not connected} -returnCodes 1
 test socket-14.12 {[socket -async] background progress triggered by [fconfigure -error]} \
     -constraints {socket} \
     -body {
diff --git a/tests/stringObj.test b/tests/stringObj.test
index 263e7ef..492e0eb 100644
--- a/tests/stringObj.test
+++ b/tests/stringObj.test
@@ -67,8 +67,8 @@ test stringObj-4.2 {Tcl_SetObjLength procedure, string gets longer} testobj {
     testobj freeallvars
     teststringobj set 1 abcdef
     teststringobj setlength 1 10
-    list [teststringobj length 1] [teststringobj length2 1]
-} {10 10}
+    teststringobj length 1
+} 10
 test stringObj-4.3 {Tcl_SetObjLength procedure, string gets longer} testobj {
     testobj freeallvars
     teststringobj set 1 abcdef
@@ -76,7 +76,7 @@ test stringObj-4.3 {Tcl_SetObjLength procedure, string gets longer} testobj {
     list [teststringobj length 1] [teststringobj length2 1] \
 	    [teststringobj get 1]
 } {10 20 abcdefxyzq}
-test stringObj-4.4 {Tcl_SetObjLength procedure, "expty string", length 0} testobj {
+test stringObj-4.4 {Tcl_SetObjLength procedure, "empty string", length 0} testobj {
     testobj freeallvars
     testobj newobj 1
     teststringobj setlength 1 0
diff --git a/tests/tcltest.test b/tests/tcltest.test
index 48a3c17..19d0ad2 100644
--- a/tests/tcltest.test
+++ b/tests/tcltest.test
@@ -556,7 +556,7 @@ switch -- $::tcl_platform(platform) {
     default {
 	# note in FAT/NTFS we won't be able to protect directory with read-only attribute...
 	catch {file attributes $notWriteableDir -readonly 1}
-	catch {testchmod 0 $notWriteableDir}
+	catch {testchmod 0o444 $notWriteableDir}
     }
 }
 test tcltest-8.3 {tcltest a.tcl -tmpdir notReadableDir} {
diff --git a/tests/tcltests.tcl b/tests/tcltests.tcl
index a2251bf..61366a4 100644
--- a/tests/tcltests.tcl
+++ b/tests/tcltests.tcl
@@ -34,6 +34,18 @@ namespace eval ::tcltests {
     }
 
 
+    # Stolen from dict.test
+    proc scriptmemcheck script {
+	set end [lindex [split [memory info] \n] 3 3]
+	for {set i 0} {$i < 5} {incr i} {
+	    uplevel 1 $script
+	    set tmp $end
+	    set end [lindex [split [memory info] \n] 3 3]
+	}
+	expr {$end - $tmp}
+    }
+
+
     proc tempdir_alternate {} {
 	close [file tempfile tempfile]
 	set tmpdir [file dirname $tempfile]
diff --git a/tests/unixFCmd.test b/tests/unixFCmd.test
index e1084af..1250c0b 100644
--- a/tests/unixFCmd.test
+++ b/tests/unixFCmd.test
@@ -112,7 +112,7 @@ test unixFCmd-1.2 {TclpRenameFile: EEXIST} -setup {
     file rename td2 td1
 } -returnCodes error -cleanup {
     cleanup
-} -result {error renaming "td2" to "td1/td2": file already exists}
+} -result {error renaming "td2" to "td1/td2": file exists}
 test unixFCmd-1.3 {TclpRenameFile: EINVAL} -setup {
     cleanup
 } -constraints {unix notRoot} -body {
diff --git a/tests/utfext.test b/tests/utfext.test
new file mode 100644
index 0000000..b980800
--- /dev/null
+++ b/tests/utfext.test
@@ -0,0 +1,101 @@
+# This file contains a collection of tests for Tcl_UtfToExternal and
+# Tcl_UtfToExternal. Sourcing this file into Tcl runs the tests and generates
+# errors. No output means no errors found.
+#
+# Copyright (c) 2023 Ashok P. Nadkarni
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+if {"::tcltest" ni [namespace children]} {
+    package require tcltest 2.5
+    namespace import -force ::tcltest::*
+}
+
+::tcltest::loadTestedCommands
+catch [list package require -exact tcl::test [info patchlevel]]
+
+testConstraint testbytestring [llength [info commands testbytestring]]
+testConstraint testencoding [llength [info commands testencoding]]
+
+# Maps encoded bytes string to utf-8 equivalents, both in hex
+# encoding utf-8 encdata
+lappend utfExtMap {*}{
+    ascii 414243 414243
+}
+
+if {[info commands printable] eq ""} {
+    proc printable {s} {
+        set print ""
+        foreach c [split $s ""] {
+            set i [scan $c %c]
+            if {[string is print $c] && ($i <= 127)} {
+                append print $c
+            } elseif {$i <= 0xff} {
+                append print \\x[format %02X $i]
+            } elseif {$i <= 0xffff} {
+                append print \\u[format %04X $i]
+            } else {
+                append print \\U[format %08X $i]
+            }
+        }
+        return $print
+    }
+}
+
+# Simple test with basic flags
+proc testbasic {direction enc hexin hexout {flags {start end}}} {
+    if {$direction eq "toutf"} {
+        set cmd Tcl_ExternalToUtf
+    } else {
+        set cmd Tcl_UtfToExternal
+    }
+    set in [binary decode hex $hexin]
+    set out [binary decode hex $hexout]
+    set dstlen 40 ;# Should be enough for all encoding tests
+
+    # The C wrapper fills entire destination buffer with FF.
+    # Anything beyond expected output should have FF's
+    set filler [string repeat \xFF $dstlen]
+    set result [string range "$out$filler" 0 $dstlen-1]
+    test $cmd-$enc-$hexin-[join $flags -] "$cmd - $enc - $hexin - $flags" -body \
+        [list testencoding $cmd $enc $in $flags {} $dstlen] \
+        -result [list ok {} $result]
+    foreach profile [encoding profiles] {
+        set flags2 [linsert $flags end profile$profile]
+        test $cmd-$enc-$hexin-[join $flags2 -] "$cmd - $enc - $hexin - $flags" -body \
+            [list testencoding $cmd $enc $in $flags2 {} $dstlen] \
+            -result [list ok {} $result]
+    }
+}
+
+#
+# Basic tests
+foreach {enc utfhex hex} $utfExtMap {
+    # Basic test - TCL_ENCODING_START|TCL_ENCODING_END
+    # Note by default output should be terminated with \0
+    testbasic toutf $enc $hex ${utfhex}00 {start end}
+    testbasic fromutf $enc $utfhex ${hex}00 {start end}
+
+    # Test TCL_ENCODING_NO_TERMINATE
+    testbasic toutf $enc $hex $utfhex {start end noterminate}
+    # knownBug - noterminate not obeyed by fromutf
+    # testbasic fromutf $enc $utfhex $hex {start end noterminate}
+}
+
+# Test for insufficient space
+test xx-bufferoverflow {buffer overflow Tcl_ExternalToUtf} -body {
+    testencoding Tcl_UtfToExternal utf-16 A {start end} {} 1
+} -result [list nospace {} \xFF]
+
+# Another bug - char limit not obeyed
+# % set cv 2
+# % testencoding Tcl_ExternalToUtf utf-8 abcdefgh {start end noterminate charlimit} {} 20 rv wv cv
+# nospace {} abcÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ
+
+::tcltest::cleanupTests
+return
+
+# Local Variables:
+# mode: tcl
+# End:
diff --git a/tests/winConsole.test b/tests/winConsole.test
index b04f3e9..3104184 100644
--- a/tests/winConsole.test
+++ b/tests/winConsole.test
@@ -198,7 +198,7 @@ test console-fconfigure-get-1.0 {
     Console get stdin configuration
 } -constraints {win interactive} -body {
     lsort [dict keys [fconfigure stdin]]
-} -result {-blocking -buffering -buffersize -encoding -eofchar -inputmode -translation}
+} -result {-blocking -buffering -buffersize -encoding -eofchar -inputmode -profile -translation}
 
 set testnum 0
 foreach {opt result} {
@@ -224,7 +224,7 @@ test console-fconfigure-get-1.[incr testnum] {
     fconfigure -winsize
 } -constraints {win interactive} -body {
     fconfigure stdin -winsize
-} -result {bad option "-winsize": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, -nocomplainencoding, -strictencoding, -translation, or -inputmode} -returnCodes error
+} -result {bad option "-winsize": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, -profile, -translation, or -inputmode} -returnCodes error
 
 ## fconfigure get stdout/stderr
 foreach chan {stdout stderr} major {2 3} {
@@ -232,7 +232,7 @@ foreach chan {stdout stderr} major {2 3} {
         win interactive
     } -body {
         lsort [dict keys [fconfigure $chan]]
-    } -result {-blocking -buffering -buffersize -encoding -eofchar -translation -winsize}
+    } -result {-blocking -buffering -buffersize -encoding -eofchar -profile -translation -winsize}
     set testnum 0
     foreach {opt result} {
         -blocking 1
@@ -260,7 +260,7 @@ foreach chan {stdout stderr} major {2 3} {
         fconfigure -inputmode
     } -constraints {win interactive} -body {
         fconfigure $chan -inputmode
-    } -result {bad option "-inputmode": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, -nocomplainencoding, -strictencoding, -translation, or -winsize} -returnCodes error
+    } -result {bad option "-inputmode": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, -profile, -translation, or -winsize} -returnCodes error
 
 }
 
@@ -330,7 +330,7 @@ test console-fconfigure-set-1.3 {
     fconfigure stdin -winsize
 } -constraints {win interactive} -body {
     fconfigure stdin -winsize {10 30}
-} -result {bad option "-winsize": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, -nocomplainencoding, -strictencoding, -translation, or -inputmode} -returnCodes error
+} -result {bad option "-winsize": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, -profile, -translation, or -inputmode} -returnCodes error
 
 ## fconfigure set stdout,stderr
 
@@ -338,13 +338,13 @@ test console-fconfigure-set-2.0 {
     fconfigure stdout -winsize
 } -constraints {win interactive} -body {
     fconfigure stdout -winsize {10 30}
-} -result {bad option "-winsize": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, -nocomplainencoding, -strictencoding, or -translation} -returnCodes error
+} -result {bad option "-winsize": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, -profile, or -translation} -returnCodes error
 
 test console-fconfigure-set-3.0 {
     fconfigure stderr -winsize
 } -constraints {win interactive} -body {
     fconfigure stderr -winsize {10 30}
-} -result {bad option "-winsize": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, -nocomplainencoding, -strictencoding, or -translation} -returnCodes error
+} -result {bad option "-winsize": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, -profile, or -translation} -returnCodes error
 
 # Multiple threads
 
diff --git a/tests/winFCmd.test b/tests/winFCmd.test
index 43c7ced..3be1920 100644
--- a/tests/winFCmd.test
+++ b/tests/winFCmd.test
@@ -45,15 +45,20 @@ proc contents {file} {
     set r
 }
 
+proc cleanupRecurse {args} {
+    # Assumes no loops via links!
+    # Need to change permissions BEFORE deletion
+    testchmod 0o777 {*}$args
+    foreach victim $args {
+        if {[file isdirectory $victim]} {
+            cleanupRecurse {*}[glob -nocomplain -directory $victim td* tf* Test*]
+        }
+        file delete -force $victim
+    }
+}
 proc cleanup {args} {
-    foreach p ". $args" {
-	set x ""
-	catch {
-	    set x [glob -directory $p tf* td*]
-	}
-	if {$x != ""} {
-	    catch {file delete -force -- {*}$x}
-	}
+    foreach p [list [pwd] {*}$args] {
+        cleanupRecurse {*}[glob -nocomplain -directory $p tf* td*]
     }
 }
 
@@ -245,8 +250,9 @@ test winFCmd-1.23 {TclpRenameFile: move dir into self} -setup {
 test winFCmd-1.24 {TclpRenameFile: move a root dir} -setup {
     cleanup
 } -constraints {win testfile} -body {
+    # Error code depends on Windows version
     testfile mv / c:/
-} -returnCodes error -result EINVAL
+} -returnCodes error -result {^(EINVAL|ENOENT)$} -match regexp
 test winFCmd-1.25 {TclpRenameFile: cross file systems} -setup {
     cleanup
 } -constraints {win cdrom testfile} -body {
@@ -379,12 +385,12 @@ test winFCmd-1.38 {TclpRenameFile: check rename of conflicting inodes} -setup {
     cleanup
 } -constraints {win winNonZeroInodes knownMsvcBug notInCIenv} -body {
     file mkdir td1
-    foreach {a b} [MakeFiles td1] break
+    lassign [MakeFiles td1] a b
     file rename -force $a $b
     file exists $a
 } -cleanup {
     cleanup
-} -result {0}
+} -result 0
 
 
 test winFCmd-2.1 {TclpCopyFile: errno: EACCES} -setup {
@@ -450,11 +456,11 @@ test winFCmd-2.12 {TclpCopyFile: CopyFile succeeds} -setup {
     cleanup
 } -constraints {win testfile} -body {
     createfile tf1 tf1
-    testchmod 0 tf1
+    file attribute tf1 -readonly 1
     testfile cp tf1 tf2
     list [contents tf2] [file writable tf2]
 } -cleanup {
-    catch {testchmod 0o666 tf1}
+    testchmod 0o660 tf1
     cleanup
 } -result {tf1 0}
 test winFCmd-2.13 {TclpCopyFile: CopyFile fails} -setup {
@@ -496,11 +502,10 @@ test winFCmd-2.17 {TclpCopyFile: dst is readonly} -setup {
 } -constraints {win testfile testchmod} -body {
     createfile tf1 tf1
     createfile tf2 tf2
-    testchmod 0 tf2
+    file attribute tf2 -readonly 1
     testfile cp tf1 tf2
     list [file writable tf2] [contents tf2]
 } -cleanup {
-    catch {testchmod 0o666 tf2}
     cleanup
 } -result {1 tf1}
 
@@ -578,7 +583,6 @@ test winFCmd-3.11 {TclpDeleteFile: still can't remove path} -setup {
     testfile rm tf1
 } -cleanup {
     close $fd
-    catch {testchmod 0o666 tf1}
     cleanup
 } -returnCodes error -result EACCES
 
@@ -617,15 +621,18 @@ test winFCmd-5.1 {TclpCopyDirectory: calls TraverseWinTree} -setup {
 
 test winFCmd-6.1 {TclpRemoveDirectory: errno: EACCES} -setup {
     cleanup
-} -constraints {win testfile testchmod knownMsvcBug notInCIenv} -body {
-    file mkdir td1
-    testchmod 0 td1
-    testfile rmdir td1
-    file exists td1
+} -constraints {win testfile testchmod notInCIenv} -body {
+    # Parent's FILE_DELETE_CHILD setting permits deletion of subdir
+    # even when subdir DELETE mask is clear. So we need an intermediate
+    # parent td0 with FILE_DELETE_CHILD turned off while allowing R/W.
+    file mkdir td0/td1
+    testchmod 0o777 td0
+    testchmod 0 td0/td1
+    testfile rmdir td0/td1
+    file exists td0/td1
 } -returnCodes error -cleanup {
-    catch {testchmod 0o666 td1}
     cleanup
-} -result {td1 EACCES}
+} -result {td0/td1 EACCES}
 # This next test has a very hokey way of matching...
 test winFCmd-6.2 {TclpRemoveDirectory: errno: EEXIST} -setup {
     cleanup
@@ -633,7 +640,7 @@ test winFCmd-6.2 {TclpRemoveDirectory: errno: EEXIST} -setup {
     file mkdir td1/td2
     list [catch {testfile rmdir td1} msg] [file tail $msg]
 } -result {1 {td1 EEXIST}}
-test winFCmd-6.3 {TclpRemoveDirectory: errno: EACCES} {win emptyTest} {
+test winFCmd-6.3 {TclpRemoveDirectory: errno: EACCES} {win emptyTest trashSystem} {
     # can't test this w/o removing everything on your hard disk first!
     # testfile rmdir /
 } {}
@@ -669,17 +676,7 @@ test winFCmd-6.8 {TclpRemoveDirectory: RemoveDirectory fails} -setup {
     createfile tf1
     list [catch {testfile rmdir tf1} msg] [file tail $msg]
 } -result {1 {tf1 ENOTDIR}}
-test winFCmd-6.9 {TclpRemoveDirectory: errno == EACCES} -setup {
-    cleanup
-} -constraints {win testfile testchmod knownMsvcBug notInCIenv} -body {
-    file mkdir td1
-    testchmod 0 td1
-    testfile rmdir td1
-    file exists td1
-} -returnCodes error -cleanup {
-    catch {testchmod 0o666 td1}
-    cleanup
-} -result {td1 EACCES}
+# winFCmd-6.9 removed - was exact dup of winFCmd-6.1
 test winFCmd-6.11 {TclpRemoveDirectory: attr == -1} -setup {
     cleanup
 } -constraints {win testfile notInCIenv} -body {
@@ -689,15 +686,19 @@ test winFCmd-6.11 {TclpRemoveDirectory: attr == -1} -setup {
 } -returnCodes error -match regexp -result {^/ E(ACCES|EXIST)$}
 test winFCmd-6.13 {TclpRemoveDirectory: write-protected} -setup {
     cleanup
-} -constraints {win testfile testchmod knownMsvcBug notInCIenv} -body {
-    file mkdir td1
-    testchmod 0 td1
-    testfile rmdir td1
-    file exists td1
+} -constraints {win testfile testchmod notInCIenv} -body {
+    # Parent's FILE_DELETE_CHILD setting permits deletion of subdir
+    # even when subdir DELETE mask is clear. So we need an intermediate
+    # parent td0 with FILE_DELETE_CHILD turned off while allowing R/W.
+    file mkdir td0/td1
+    testchmod 0o770 td0
+    testchmod 0o444 td0/td1
+    testfile rmdir td0/td1
+    file exists td0/td1
 } -cleanup {
-    catch {testchmod 0o666 td1}
+    testchmod 0o770 td0/td1
     cleanup
-} -returnCodes error -result {td1 EACCES}
+} -returnCodes error -result {td0/td1 EACCES}
 # This next test has a very hokey way of matching...
 test winFCmd-6.15 {TclpRemoveDirectory: !recursive} -setup {
     cleanup
@@ -791,11 +792,12 @@ test winFCmd-7.11 {TraverseWinTree: call TraversalCopy: DOTREE_PRED} -setup {
 } -constraints {win testfile testchmod} -body {
     file mkdir td1
     createfile td1/tf1 tf1
-    testchmod 0 td1
+    testchmod 0o770 td1/tf1; # Else tf2 will have no ACL after td1 testchmod
+    testchmod 0o400 td1
     testfile cpdir td1 td2
     list [file exists td2] [file writable td2]
 } -cleanup {
-    catch {testchmod 0o666 td1}
+    testchmod 0o660 td1
     cleanup
 } -result {1 1}
 test winFCmd-7.12 {TraverseWinTree: call TraversalDelete: DOTREE_PRED} -setup {
@@ -862,11 +864,12 @@ test winFCmd-7.19 {TraverseWinTree: call TraversalCopy: DOTREE_POSTD} -setup {
 } -constraints {win testfile testchmod} -body {
     file mkdir td1
     createfile td1/tf1 tf1
-    testchmod 0 td1
+    testchmod 0o770 td1/tf1; # Else tf2 will have no ACL after td1 testchmod
+    testchmod 0o400 td1
     testfile cpdir td1 td2
     list [file exists td2] [file writable td2]
 } -cleanup {
-    catch {testchmod 0o666 td1}
+    testchmod 0o660 td1
     cleanup
 } -result {1 1}
 test winFCmd-7.20 {TraverseWinTree: call TraversalDelete: DOTREE_POSTD} -setup {
@@ -893,11 +896,12 @@ test winFCmd-8.2 {TraversalCopy: DOTREE_PRED} -setup {
     cleanup
 } -constraints {win testfile testchmod} -body {
     file mkdir td1/td2
-    testchmod 0 td1
+    testchmod 0o770 td1/td2; # Else td2 will have no ACL after td1 testchmod
+    testchmod 0o400 td1
     testfile cpdir td1 td2
     list [file writable td1] [file writable td1/td2]
 } -cleanup {
-    catch {testchmod 0o666 td1}
+    testchmod 0o660 td1
     cleanup
 } -result {0 1}
 test winFCmd-8.3 {TraversalCopy: DOTREE_POSTD} -setup {
@@ -918,15 +922,19 @@ test winFCmd-9.1 {TraversalDelete: DOTREE_F} -setup {
 } -result {}
 test winFCmd-9.3 {TraversalDelete: DOTREE_PRED} -setup {
     cleanup
-} -constraints {win testfile testchmod knownMsvcBug notInCIenv} -body {
-    file mkdir td1/td2
-    testchmod 0 td1
-    testfile rmdir -force td1
+} -constraints {win testfile testchmod notInCIenv} -body {
+    # Parent's FILE_DELETE_CHILD setting permits deletion of subdir
+    # even when subdir DELETE mask is clear. So we need an intermediate
+    # parent td0 with FILE_DELETE_CHILD turned off while allowing R/W.
+    file mkdir td0/td1/td2
+    testchmod 0o770 td0
+    testchmod 0o400 td0/td1
+    testfile rmdir -force td0/td1
     file exists td1
 } -cleanup {
-    catch {testchmod 0o666 td1}
+    testchmod 0o770 td0/td1
     cleanup
-} -returnCodes error -result {td1 EACCES}
+} -returnCodes error -result {td0/td1 EACCES}
 test winFCmd-9.4 {TraversalDelete: DOTREE_POSTD} -setup {
     cleanup
 } -constraints {win testfile} -body {
@@ -1417,7 +1425,6 @@ test winFCmd-19.9 {Windows devices path names} -constraints win -body {
 #    }
 #}
 
-# cleanup
 cleanup
 ::tcltest::cleanupTests
 return
diff --git a/tests/zlib.test b/tests/zlib.test
index 9e6d563..720fdd6 100644
--- a/tests/zlib.test
+++ b/tests/zlib.test
@@ -292,7 +292,7 @@ test zlib-8.6 {transformation and fconfigure} -setup {
 } -cleanup {
     catch {close $fd}
     removeFile $file
-} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -nocomplainencoding 0 -strictencoding 0 -translation lf} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -nocomplainencoding 0 -strictencoding 0 -translation lf -checksum 1 -dictionary {}} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -nocomplainencoding 0 -strictencoding 0 -translation lf}}
+} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -profile tcl8 -translation lf} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -profile tcl8 -translation lf -checksum 1 -dictionary {}} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -profile tcl8 -translation lf}}
 test zlib-8.7 {transformation and fconfigure} -setup {
     set file [makeFile {} test.gz]
     set fd [open $file wb]
@@ -302,7 +302,7 @@ test zlib-8.7 {transformation and fconfigure} -setup {
 } -cleanup {
     catch {close $fd}
     removeFile $file
-} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -nocomplainencoding 0 -strictencoding 0 -translation lf} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -nocomplainencoding 0 -strictencoding 0 -translation lf -checksum 0} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -nocomplainencoding 0 -strictencoding 0 -translation lf}}
+} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -profile tcl8 -translation lf} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -profile tcl8 -translation lf -checksum 0} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -profile tcl8 -translation lf}}
 # Input is headers from fetching SPDY draft
 # Dictionary is that which is proposed _in_ SPDY draft
 set spdyHeaders "HTTP/1.0 200 OK\r\nContent-Type: text/html; charset=utf-8\r\nX-Robots-Tag: noarchive\r\nLast-Modified: Tue, 05 Jun 2012 02:43:25 GMT\r\nETag: \"1338864205129|#public|0|en|||0\"\r\nExpires: Tue, 05 Jun 2012 16:17:11 GMT\r\nDate: Tue, 05 Jun 2012 16:17:06 GMT\r\nCache-Control: public, max-age=5\r\nX-Content-Type-Options: nosniff\r\nX-XSS-Protection: 1; mode=block\r\nServer: GSE\r\n"
diff --git a/tools/valgrind_check_success b/tools/valgrind_check_success
new file mode 100644
index 0000000..24830d5
--- /dev/null
+++ b/tools/valgrind_check_success
@@ -0,0 +1,30 @@
+#! /usr/bin/env tclsh
+
+
+proc main {sourcetype source} {
+	switch $sourcetype {
+		file {
+			set chan [open $source]
+			try {
+				set data [read $chan]
+			} finally {
+				close $chan
+			}
+		}
+		string {
+			set data $source
+		}
+		default {
+			error [list {wrong # args}]
+		}
+	}
+	set found [regexp -inline -all {blocks are\
+	    (?:(?:(?:definitely|indirectly|possibly) lost)|still reachable)} $data]
+	if {[llength $found]} {
+		puts 0
+	} else {
+		puts 1
+	}
+	flush stdout
+}
+main {*}$argv
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 6229b4d..1bf5814 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -956,6 +956,27 @@ valgrind: ${TCL_EXE} ${TCLTEST_EXE}
 		$(TOP_DIR)/tests/all.tcl -singleproc 1 -constraints valgrind \
 		$(TESTFLAGS)
 
+testresults/valgrind/%.result: ${TCL_EXE} ${TCLTEST_EXE}
+	@mkdir -p testresults/valgrind
+	$(SHELL_ENV) $(VALGRIND) $(VALGRINDARGS) ./${TCLTEST_EXE} \
+		$(TOP_DIR)/tests/all.tcl -singleproc 1 -constraints valgrind \
+		-file $(basename $(notdir $@)) > $@.tmp 2>&1
+	@mv $@.tmp $@
+.PRECIOUS: testresults/valgrind/%.result
+
+
+testresults/valgrind/%.success: testresults/valgrind/%.result
+	@printf '%s' valgrind >&2
+	@printf ' %s' $(basename $(notdir $@)) >&2
+	@printf '\n >&2'
+	@status=$$(./${TCLTEST_EXE} $(TOP_DIR)/tools/valgrind_check_success \
+		file $(basename $@).result); \
+	if [ "$$status" -eq 1 ]; then touch $@; exit 0; else exit 1; fi
+
+valgrind_each: $(addprefix testresults/valgrind/,$(addsuffix .success,$(notdir\
+	$(wildcard $(TOP_DIR)/tests/*.test))))
+
+
 valgrindshell: ${TCL_EXE}
 	$(SHELL_ENV) $(VALGRIND) $(VALGRINDARGS) ./${TCL_EXE} $(SCRIPT)
 
@@ -1055,9 +1076,9 @@ install-libraries: libraries
 	@echo "Installing package msgcat 1.7.1 as a Tcl Module"
 	@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl \
 		"$(MODULE_INSTALL_DIR)/9.0/msgcat-1.7.1.tm"
-	@echo "Installing package tcltest 2.5.5 as a Tcl Module"
+	@echo "Installing package tcltest 2.5.6 as a Tcl Module"
 	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl \
-		"$(MODULE_INSTALL_DIR)/9.0/tcltest-2.5.5.tm"
+		"$(MODULE_INSTALL_DIR)/9.0/tcltest-2.5.6.tm"
 	@echo "Installing package platform 1.0.19 as a Tcl Module"
 	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl \
 		"$(MODULE_INSTALL_DIR)/9.0/platform-1.0.19.tm"
diff --git a/unix/configure b/unix/configure
index 747b81e..afa4fea 100755
--- a/unix/configure
+++ b/unix/configure
@@ -6506,16 +6506,16 @@ then :
 			    do64bit_ok=yes
 
 fi;;
-		    arm64|arm64e)
-			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compiler accepts -arch arm64e flag" >&5
-printf %s "checking if compiler accepts -arch arm64e flag... " >&6; }
-if test ${tcl_cv_cc_arch_arm64e+y}
+		    arm64)
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compiler accepts -arch arm64 flag" >&5
+printf %s "checking if compiler accepts -arch arm64 flag... " >&6; }
+if test ${tcl_cv_cc_arch_arm64+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
 
 			    hold_cflags=$CFLAGS
-			    CFLAGS="$CFLAGS -arch arm64e"
+			    CFLAGS="$CFLAGS -arch arm64"
 			    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -6529,20 +6529,20 @@ main (void)
 _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
-  tcl_cv_cc_arch_arm64e=yes
+  tcl_cv_cc_arch_arm64=yes
 else $as_nop
-  tcl_cv_cc_arch_arm64e=no
+  tcl_cv_cc_arch_arm64=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 			    CFLAGS=$hold_cflags
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_cc_arch_arm64e" >&5
-printf "%s\n" "$tcl_cv_cc_arch_arm64e" >&6; }
-			if test $tcl_cv_cc_arch_arm64e = yes
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_cc_arch_arm64" >&5
+printf "%s\n" "$tcl_cv_cc_arch_arm64" >&6; }
+			if test $tcl_cv_cc_arch_arm64 = yes
 then :
 
-			    CFLAGS="$CFLAGS -arch arm64e"
+			    CFLAGS="$CFLAGS -arch arm64"
 			    do64bit_ok=yes
 
 fi;;
@@ -6554,7 +6554,7 @@ printf "%s\n" "$as_me: WARNING: Don't know how enable 64-bit on architecture \`a
 else $as_nop
 
 		# Check for combined 32-bit and 64-bit fat build
-		if echo "$CFLAGS " |grep -E -q -- '-arch (ppc64|x86_64|arm64e) ' \
+		if echo "$CFLAGS " |grep -E -q -- '-arch (ppc64|x86_64|arm64) ' \
 		    && echo "$CFLAGS " |grep -E -q -- '-arch (ppc|i386) '
 then :
 
@@ -7631,56 +7631,6 @@ printf "%s\n" "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
 	tcl_flags="$tcl_flags _LARGEFILE64_SOURCE"
     fi
 
-
-    if test ${tcl_cv_flag__largefile_source64+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/stat.h>
-int
-main (void)
-{
-char *p = (char *)open64;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  tcl_cv_flag__largefile_source64=no
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#define _LARGEFILE_SOURCE64 1
-#include <sys/stat.h>
-int
-main (void)
-{
-char *p = (char *)open64;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  tcl_cv_flag__largefile_source64=yes
-else $as_nop
-  tcl_cv_flag__largefile_source64=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-    if test "x${tcl_cv_flag__largefile_source64}" = "xyes" ; then
-
-printf "%s\n" "#define _LARGEFILE_SOURCE64 1" >>confdefs.h
-
-	tcl_flags="$tcl_flags _LARGEFILE_SOURCE64"
-    fi
-
     if test "x${tcl_flags}" = "x" ; then
 	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5
 printf "%s\n" "none" >&6; }
@@ -7691,8 +7641,8 @@ printf "%s\n" "${tcl_flags}" >&6; }
 
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for 64-bit integer type" >&5
-printf %s "checking for 64-bit integer type... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if 'long' and 'long long' have the same size (64-bit)?" >&5
+printf %s "checking if 'long' and 'long long' have the same size (64-bit)?... " >&6; }
     if test ${tcl_cv_type_64bit+y}
 then :
   printf %s "(cached) " >&6
@@ -7729,6 +7679,8 @@ printf "%s\n" "#define TCL_WIDE_INT_IS_LONG 1" >>confdefs.h
 	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
     else
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 	# Now check for auxiliary declarations
 	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for struct dirent64" >&5
 printf %s "checking for struct dirent64... " >&6; }
@@ -9669,7 +9621,7 @@ fi
 
 
 #--------------------------------------------------------------------
-#	On some systems strstr is broken: it returns a pointer even even if
+#	On some systems strstr is broken: it returns a pointer even if
 #	the original string is empty.
 #--------------------------------------------------------------------
 
diff --git a/unix/configure.ac b/unix/configure.ac
index b42e2a2..4b9a78b 100644
--- a/unix/configure.ac
+++ b/unix/configure.ac
@@ -394,7 +394,7 @@ AC_CHECK_FUNC(memmove, , [
     AC_DEFINE(NO_STRING_H, 1, [Do we have <string.h>?]) ])
 
 #--------------------------------------------------------------------
-#	On some systems strstr is broken: it returns a pointer even even if
+#	On some systems strstr is broken: it returns a pointer even if
 #	the original string is empty.
 #--------------------------------------------------------------------
 
diff --git a/unix/dltest/Makefile.in b/unix/dltest/Makefile.in
index 19b7d84..e8dce2f 100644
--- a/unix/dltest/Makefile.in
+++ b/unix/dltest/Makefile.in
@@ -17,7 +17,7 @@ TCL_VERSION=		@TCL_VERSION@
 
 CFLAGS_DEBUG		= @CFLAGS_DEBUG@
 CFLAGS_OPTIMIZE		= @CFLAGS_OPTIMIZE@
-CFLAGS			= @CFLAGS_DEFAULT@ @CFLAGS@ -DTCL_NO_DEPRECATED=1
+CFLAGS			= @CFLAGS_DEFAULT@ @CFLAGS@ -DTCL_NO_DEPRECATED=1 -Wall -Wextra -Wc++-compat -Wconversion -Werror
 LDFLAGS_DEBUG		= @LDFLAGS_DEBUG@
 LDFLAGS_OPTIMIZE	= @LDFLAGS_OPTIMIZE@
 LDFLAGS			= @LDFLAGS_DEFAULT@ @LDFLAGS@
@@ -26,14 +26,14 @@ CC_SWITCHES = $(CFLAGS) -I${SRC_DIR}/../../generic -DTCL_MEM_DEBUG \
 	${SHLIB_CFLAGS} -DUSE_TCL_STUBS ${AC_FLAGS}
 
 all: embtest tcl9pkga${SHLIB_SUFFIX} tcl9pkgb${SHLIB_SUFFIX} tcl9pkgc${SHLIB_SUFFIX} \
-	tcl9pkgd${SHLIB_SUFFIX} tcl9pkge${SHLIB_SUFFIX} tcl9pkgua${SHLIB_SUFFIX} tcl9pkgooa${SHLIB_SUFFIX} \
-	pkga${SHLIB_SUFFIX} pkgb${SHLIB_SUFFIX} pkgc${SHLIB_SUFFIX}
+	tcl9pkgd${SHLIB_SUFFIX} tcl9pkge${SHLIB_SUFFIX} tcl9pkgt${SHLIB_SUFFIX} tcl9pkgua${SHLIB_SUFFIX} \
+	tcl9pkgooa${SHLIB_SUFFIX} pkga${SHLIB_SUFFIX} pkgb${SHLIB_SUFFIX} pkgc${SHLIB_SUFFIX}  pkgt${SHLIB_SUFFIX}
 	@if test -n "$(DLTEST_SUFFIX)"; then $(MAKE) dltest_suffix; fi
 	@touch ../dltest.marker
 
 dltest_suffix: tcl9pkga${DLTEST_SUFFIX} tcl9pkgb${DLTEST_SUFFIX} tcl9pkgc${DLTEST_SUFFIX} \
-	tcl9pkgd${DLTEST_SUFFIX} tcl9pkge${DLTEST_SUFFIX} tcl9pkgua${DLTEST_SUFFIX} tcl9pkgooa${DLTEST_SUFFIX} \
-	pkga${DLTEST_SUFFIX} pkgb${DLTEST_SUFFIX} pkgc${DLTEST_SUFFIX}
+	tcl9pkgd${DLTEST_SUFFIX} tcl9pkge${DLTEST_SUFFIX} tcl9pkgt${DLTEST_SUFFIX} tcl9pkgua${DLTEST_SUFFIX} \
+	tcl9pkgooa${DLTEST_SUFFIX} pkga${DLTEST_SUFFIX} pkgb${DLTEST_SUFFIX} pkgc${DLTEST_SUFFIX} pkgt${DLTEST_SUFFIX}
 	@touch ../dltest.marker
 
 embtest.o: $(SRC_DIR)/embtest.c
@@ -51,6 +51,9 @@ pkgb.o: $(SRC_DIR)/pkgb.c
 pkgc.o: $(SRC_DIR)/pkgc.c
 	$(CC) -c $(CC_SWITCHES) $(SRC_DIR)/pkgc.c
 
+pkgt.o: $(SRC_DIR)/pkgt.c
+	$(CC) -c $(CC_SWITCHES) $(SRC_DIR)/pkgt.c
+
 tcl8pkga.o: $(SRC_DIR)/pkga.c
 	$(CC) -o $@ -c $(CC_SWITCHES) -DTCL_MAJOR_VERSION=8 $(SRC_DIR)/pkga.c
 
@@ -60,6 +63,9 @@ tcl8pkgb.o: $(SRC_DIR)/pkgb.c
 tcl8pkgc.o: $(SRC_DIR)/pkgc.c
 	$(CC) -o $@ -c $(CC_SWITCHES) -DTCL_MAJOR_VERSION=8 $(SRC_DIR)/pkgc.c
 
+tcl8pkgt.o: $(SRC_DIR)/pkgt.c
+	$(CC) -o $@ -c $(CC_SWITCHES) -DTCL_MAJOR_VERSION=8 $(SRC_DIR)/pkgt.c
+
 pkgd.o: $(SRC_DIR)/pkgd.c
 	$(CC) -c $(CC_SWITCHES) $(SRC_DIR)/pkgd.c
 
@@ -87,6 +93,9 @@ tcl9pkgb${SHLIB_SUFFIX}: pkgb.o
 tcl9pkgc${SHLIB_SUFFIX}: pkgc.o
 	${SHLIB_LD} -o $@ pkgc.o ${SHLIB_LD_LIBS}
 
+tcl9pkgt${SHLIB_SUFFIX}: pkgt.o
+	${SHLIB_LD} -o $@ pkgt.o ${SHLIB_LD_LIBS}
+
 pkga${SHLIB_SUFFIX}: tcl8pkga.o
 	${SHLIB_LD} -o $@ tcl8pkga.o ${SHLIB_LD_LIBS}
 
@@ -96,6 +105,9 @@ pkgb${SHLIB_SUFFIX}: tcl8pkgb.o
 pkgc${SHLIB_SUFFIX}: tcl8pkgc.o
 	${SHLIB_LD} -o $@ tcl8pkgc.o ${SHLIB_LD_LIBS}
 
+pkgt${SHLIB_SUFFIX}: tcl8pkgt.o
+	${SHLIB_LD} -o $@ tcl8pkgt.o ${SHLIB_LD_LIBS}
+
 tcl9pkgd${SHLIB_SUFFIX}: pkgd.o
 	${SHLIB_LD} -o $@ pkgd.o ${SHLIB_LD_LIBS}
 
@@ -120,6 +132,9 @@ tcl9pkgb${DLTEST_SUFFIX}: pkgb.o
 tcl9pkgc${DLTEST_SUFFIX}: pkgc.o
 	${DLTEST_LD} -o $@ pkgc.o ${SHLIB_LD_LIBS}
 
+tcl9pkgt${DLTEST_SUFFIX}: pkgt.o
+	${DLTEST_LD} -o $@ pkgt.o ${SHLIB_LD_LIBS}
+
 pkga${DLTEST_SUFFIX}: tcl8pkga.o
 	${DLTEST_LD} -o $@ tcl8pkga.o ${SHLIB_LD_LIBS}
 
@@ -129,6 +144,9 @@ pkgb${DLTEST_SUFFIX}: tcl8pkgb.o
 pkgc${DLTEST_SUFFIX}: tcl8pkgc.o
 	${DLTEST_LD} -o $@ tcl8pkgc.o ${SHLIB_LD_LIBS}
 
+pkgt${DLTEST_SUFFIX}: tcl8pkgt.o
+	${DLTEST_LD} -o $@ tcl8pkgt.o ${SHLIB_LD_LIBS}
+
 tcl9pkgd${DLTEST_SUFFIX}: pkgd.o
 	${DLTEST_LD} -o $@ pkgd.o ${SHLIB_LD_LIBS}
 
diff --git a/unix/dltest/embtest.c b/unix/dltest/embtest.c
index 1111268..ff58cc4 100644
--- a/unix/dltest/embtest.c
+++ b/unix/dltest/embtest.c
@@ -6,6 +6,7 @@ MODULE_SCOPE const TclStubs *tclStubsPtr;
 int main(int argc, char **argv) {
     const char *version;
     int exitcode = 0;
+    (void)argc;
 
     if (tclStubsPtr != NULL) {
 	printf("ERROR: stub table is already initialized");
@@ -25,6 +26,9 @@ int main(int argc, char **argv) {
     }
     tclStubsPtr = NULL;
     version = Tcl_FindExecutable(argv[0]);
+    if (version != NULL) {
+	printf("Tcl_FindExecutable gives version %s\n", version);
+    }
     if (tclStubsPtr == NULL) {
 	printf("ERROR: Tcl_FindExecutable does not initialize the stub table\n");
 	exitcode = 1;
diff --git a/unix/dltest/pkga.c b/unix/dltest/pkga.c
index aacb9cd..be0a492 100644
--- a/unix/dltest/pkga.c
+++ b/unix/dltest/pkga.c
@@ -51,7 +51,7 @@ Pkga_EqObjCmd(
     str1 = Tcl_GetStringFromObj(objv[1], &len1);
     str2 = Tcl_GetStringFromObj(objv[2], &len2);
     if (len1 == len2) {
-	result = (Tcl_UtfNcmp(str1, str2, len1) == 0);
+	result = (Tcl_UtfNcmp(str1, str2, (size_t)len1) == 0);
     } else {
 	result = 0;
     }
diff --git a/unix/dltest/pkgb.c b/unix/dltest/pkgb.c
index 750d270..9e834ea 100644
--- a/unix/dltest/pkgb.c
+++ b/unix/dltest/pkgb.c
@@ -13,6 +13,9 @@
 
 #undef STATIC_BUILD
 #include "tcl.h"
+#if defined(_WIN32) && defined(_MSC_VER)
+#   define snprintf _snprintf
+#endif
 
 /*
  *----------------------------------------------------------------------
@@ -48,7 +51,7 @@ Pkgb_SubObjCmd(
     if ((Tcl_GetIntFromObj(interp, objv[1], &first) != TCL_OK)
 	    || (Tcl_GetIntFromObj(interp, objv[2], &second) != TCL_OK)) {
 	char buf[TCL_INTEGER_SPACE];
-	sprintf(buf, "%d", Tcl_GetErrorLine(interp));
+	snprintf(buf, sizeof(buf), "%d", Tcl_GetErrorLine(interp));
 	Tcl_AppendResult(interp, " in line: ", buf, NULL);
 	return TCL_ERROR;
     }
@@ -105,7 +108,7 @@ Pkgb_DemoObjCmd(
     if (Tcl_GetWideIntFromObj(interp, objv[3], &numChars) != TCL_OK) {
 	return TCL_ERROR;
     }
-    result = Tcl_UtfNcmp(Tcl_GetString(objv[1]), Tcl_GetString(objv[2]), numChars);
+    result = Tcl_UtfNcmp(Tcl_GetString(objv[1]), Tcl_GetString(objv[2]), (size_t)numChars);
     Tcl_SetObjResult(interp, Tcl_NewIntObj(result));
     return TCL_OK;
 }
diff --git a/unix/dltest/pkgooa.c b/unix/dltest/pkgooa.c
index ec9fbfd..444bb81 100644
--- a/unix/dltest/pkgooa.c
+++ b/unix/dltest/pkgooa.c
@@ -94,6 +94,15 @@ static TclOOStubs stubsCopy = {
 #ifdef Tcl_GetObjectClassName
     ,NULL
 #endif
+#ifdef Tcl_MethodIsType2
+    ,NULL
+#endif
+#ifdef Tcl_NewInstanceMethod2
+    ,NULL
+#endif
+#ifdef Tcl_NewMethod2
+    ,NULL
+#endif
 };
 
 DLLEXPORT int
diff --git a/unix/dltest/pkgt.c b/unix/dltest/pkgt.c
new file mode 100644
index 0000000..e8047db
--- /dev/null
+++ b/unix/dltest/pkgt.c
@@ -0,0 +1,116 @@
+/*
+ * pkgt.c --
+ *
+ *	This file contains a simple Tcl package "pkgt" that is intended for
+ *	testing the Tcl dynamic loading facilities.
+ *
+ * Copyright © 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.
+ */
+
+#undef STATIC_BUILD
+#include "tcl.h"
+
+static int TraceProc2 (
+    void *clientData,
+    Tcl_Interp *interp,
+    size_t level,
+    const char *command,
+    Tcl_Command commandInfo,
+    size_t objc,
+    struct Tcl_Obj *const *objv)
+{
+    (void)clientData;
+    (void)interp;
+    (void)level;
+    (void)command;
+    (void)commandInfo;
+    (void)objc;
+    (void)objv;
+
+    return TCL_OK;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * Pkgt_EqObjCmd2 --
+ *
+ *	This procedure is invoked to process the "pkgt_eq" Tcl command. It
+ *	expects two arguments and returns 1 if they are the same, 0 if they
+ *	are different.
+ *
+ * Results:
+ *	A standard Tcl result.
+ *
+ * Side effects:
+ *	See the user documentation.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static int
+Pkgt_EqObjCmd2(
+    void *dummy,		/* Not used. */
+    Tcl_Interp *interp,		/* Current interpreter. */
+    size_t objc,			/* Number of arguments. */
+    Tcl_Obj *const objv[])	/* Argument objects. */
+{
+    Tcl_WideInt result;
+    const char *str1, *str2;
+    size_t len1, len2;
+    (void)dummy;
+
+    if (objc != 3) {
+	Tcl_WrongNumArgs(interp, 1, objv,  "string1 string2");
+	return TCL_ERROR;
+    }
+
+    str1 = Tcl_GetStringFromObj(objv[1], &len1);
+    str2 = Tcl_GetStringFromObj(objv[2], &len2);
+    if (len1 == len2) {
+	result = (Tcl_UtfNcmp(str1, str2, len1) == 0);
+    } else {
+	result = 0;
+    }
+    Tcl_SetObjResult(interp, Tcl_NewWideIntObj(result));
+    return TCL_OK;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * Pkgt_Init --
+ *
+ *	This is a package initialization procedure, which is called by Tcl
+ *	when this package is to be added to an interpreter.
+ *
+ * Results:
+ *	None.
+ *
+ * Side effects:
+ *	None.
+ *
+ *----------------------------------------------------------------------
+ */
+
+DLLEXPORT int
+Pkgt_Init(
+    Tcl_Interp *interp)		/* Interpreter in which the package is to be
+				 * made available. */
+{
+    int code;
+
+    if (Tcl_InitStubs(interp, "8.7-", 0) == NULL) {
+	return TCL_ERROR;
+    }
+    code = Tcl_PkgProvide(interp, "pkgt", "1.0");
+    if (code != TCL_OK) {
+	return code;
+    }
+    Tcl_CreateObjCommand2(interp, "pkgt_eq", Pkgt_EqObjCmd2, NULL, NULL);
+    Tcl_CreateObjTrace2(interp, 0, 0, TraceProc2, NULL, NULL);
+    return TCL_OK;
+}
diff --git a/unix/dltest/pkgua.c b/unix/dltest/pkgua.c
index b14fca8..8d62d99 100644
--- a/unix/dltest/pkgua.c
+++ b/unix/dltest/pkgua.c
@@ -138,7 +138,7 @@ PkguaEqObjCmd(
     str1 = Tcl_GetStringFromObj(objv[1], &len1);
     str2 = Tcl_GetStringFromObj(objv[2], &len2);
     if (len1 == len2) {
-	result = (Tcl_UtfNcmp(str1, str2, len1) == 0);
+	result = (Tcl_UtfNcmp(str1, str2, (size_t)len1) == 0);
     } else {
 	result = 0;
     }
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 84436a3..5ac917c 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1406,16 +1406,16 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 			    CFLAGS="$CFLAGS -arch x86_64"
 			    do64bit_ok=yes
 			]);;
-		    arm64|arm64e)
-			AC_CACHE_CHECK([if compiler accepts -arch arm64e flag],
-				tcl_cv_cc_arch_arm64e, [
+		    arm64)
+			AC_CACHE_CHECK([if compiler accepts -arch arm64 flag],
+				tcl_cv_cc_arch_arm64, [
 			    hold_cflags=$CFLAGS
-			    CFLAGS="$CFLAGS -arch arm64e"
+			    CFLAGS="$CFLAGS -arch arm64"
 			    AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
-				    [tcl_cv_cc_arch_arm64e=yes],[tcl_cv_cc_arch_arm64e=no])
+				    [tcl_cv_cc_arch_arm64=yes],[tcl_cv_cc_arch_arm64=no])
 			    CFLAGS=$hold_cflags])
-			AS_IF([test $tcl_cv_cc_arch_arm64e = yes], [
-			    CFLAGS="$CFLAGS -arch arm64e"
+			AS_IF([test $tcl_cv_cc_arch_arm64 = yes], [
+			    CFLAGS="$CFLAGS -arch arm64"
 			    do64bit_ok=yes
 			]);;
 		    *)
@@ -1423,7 +1423,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 		esac
 	    ], [
 		# Check for combined 32-bit and 64-bit fat build
-		AS_IF([echo "$CFLAGS " |grep -E -q -- '-arch (ppc64|x86_64|arm64e) ' \
+		AS_IF([echo "$CFLAGS " |grep -E -q -- '-arch (ppc64|x86_64|arm64) ' \
 		    && echo "$CFLAGS " |grep -E -q -- '-arch (ppc|i386) '], [
 		    fat_32_64=yes])
 	    ])
@@ -2329,7 +2329,6 @@ AC_DEFUN([SC_TCL_LINK_LIBS], [
 #	Might define the following vars:
 #		_ISOC99_SOURCE
 #		_LARGEFILE64_SOURCE
-#		_LARGEFILE_SOURCE64
 #
 #--------------------------------------------------------------------
 
@@ -2353,8 +2352,6 @@ AC_DEFUN([SC_TCL_EARLY_FLAGS],[
 	[char *p = (char *)strtoll; char *q = (char *)strtoull;])
     SC_TCL_EARLY_FLAG(_LARGEFILE64_SOURCE,[#include <sys/stat.h>],
 	[struct stat64 buf; int i = stat64("/", &buf);])
-    SC_TCL_EARLY_FLAG(_LARGEFILE_SOURCE64,[#include <sys/stat.h>],
-	[char *p = (char *)open64;])
     if test "x${tcl_flags}" = "x" ; then
 	AC_MSG_RESULT([none])
     else
@@ -2381,7 +2378,7 @@ AC_DEFUN([SC_TCL_EARLY_FLAGS],[
 #--------------------------------------------------------------------
 
 AC_DEFUN([SC_TCL_64BIT_FLAGS], [
-    AC_MSG_CHECKING([for 64-bit integer type])
+    AC_MSG_CHECKING([if 'long' and 'long long' have the same size (64-bit)?])
     AC_CACHE_VAL(tcl_cv_type_64bit,[
 	tcl_cv_type_64bit=none
 	# See if we could use long anyway  Note that we substitute in the
@@ -2391,9 +2388,10 @@ AC_DEFUN([SC_TCL_64BIT_FLAGS], [
             case 1: case (sizeof(long long)==sizeof(long)): ;
         }]])],[tcl_cv_type_64bit="long long"],[])])
     if test "${tcl_cv_type_64bit}" = none ; then
-	AC_DEFINE(TCL_WIDE_INT_IS_LONG, 1, [Do 'long' and 'long long' have the same size (64-bit)?])
+	AC_DEFINE(TCL_WIDE_INT_IS_LONG, 1, ['long' and 'long long' have the same size])
 	AC_MSG_RESULT([yes])
     else
+	AC_MSG_RESULT([no])
 	# Now check for auxiliary declarations
 	AC_CACHE_CHECK([for struct dirent64], tcl_cv_struct_dirent64,[
 	    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
diff --git a/unix/tclConfig.h.in b/unix/tclConfig.h.in
index 0075804..4d8230a 100644
--- a/unix/tclConfig.h.in
+++ b/unix/tclConfig.h.in
@@ -489,9 +489,6 @@
 /* Add the _LARGEFILE64_SOURCE flag when building */
 #undef _LARGEFILE64_SOURCE
 
-/* Add the _LARGEFILE_SOURCE64 flag when building */
-#undef _LARGEFILE_SOURCE64
-
 /* # needed in sys/socket.h Should OS/390 do the right thing with sockets? */
 #undef _OE_SOCKETS
 
diff --git a/unix/tclLoadDl.c b/unix/tclLoadDl.c
index dd6c50e..0913698 100644
--- a/unix/tclLoadDl.c
+++ b/unix/tclLoadDl.c
@@ -191,7 +191,7 @@ FindSymbol(
 #ifdef __cplusplus
     if (proc == NULL) {
 	char buf[32];
-	sprintf(buf, "%d", (int)Tcl_DStringLength(&ds));
+	snprintf(buf, sizeof(buf), "%d", (int)Tcl_DStringLength(&ds));
 	Tcl_DStringInit(&newName);
 	TclDStringAppendLiteral(&newName, "__Z");
 	Tcl_DStringAppend(&newName, buf, TCL_INDEX_NONE);
diff --git a/unix/tclSelectNotfy.c b/unix/tclSelectNotfy.c
index 7d14c26..feabfa8 100644
--- a/unix/tclSelectNotfy.c
+++ b/unix/tclSelectNotfy.c
@@ -32,7 +32,7 @@ typedef struct FileHandler {
 				 * for this file. */
     Tcl_FileProc *proc;		/* Function to call, in the style of
 				 * Tcl_CreateFileHandler. */
-    ClientData clientData;	/* Argument to pass to proc. */
+    void *clientData;	/* Argument to pass to proc. */
     struct FileHandler *nextPtr;/* Next in list of all files we care about. */
 } FileHandler;
 
@@ -214,7 +214,7 @@ static sigset_t allSigMask;
  */
 
 #if TCL_THREADS
-static TCL_NORETURN void NotifierThreadProc(ClientData clientData);
+static TCL_NORETURN void NotifierThreadProc(void *clientData);
 #if defined(HAVE_PTHREAD_ATFORK)
 static int atForkInit = 0;
 static void		AtForkChild(void);
@@ -313,7 +313,7 @@ static unsigned int __stdcall	NotifierProc(void *hwnd, unsigned int message,
  *----------------------------------------------------------------------
  */
 
-ClientData
+void *
 TclpInitNotifier(void)
 {
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
@@ -480,7 +480,7 @@ TclpCreateFileHandler(
 				 * called. */
     Tcl_FileProc *proc,		/* Function to call for each selected
 				 * event. */
-    ClientData clientData)	/* Arbitrary data to pass to proc. */
+    void *clientData)	/* Arbitrary data to pass to proc. */
 {
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
     FileHandler *filePtr = LookUpFileHandler(tsdPtr, fd, NULL);
@@ -1179,7 +1179,7 @@ NotifierThreadProc(
 	 */
 
 	do {
-	    i = read(receivePipe, buf, 1);
+	    i = (int)read(receivePipe, buf, 1);
 	    if (i <= 0) {
 		break;
 	    } else if ((i == 0) || ((i == 1) && (buf[0] == 'q'))) {
diff --git a/unix/tclUnixChan.c b/unix/tclUnixChan.c
index c41cdd9..92ddcd3 100644
--- a/unix/tclUnixChan.c
+++ b/unix/tclUnixChan.c
@@ -1009,7 +1009,7 @@ TtyGetOptionProc(
 
 	valid = 1;
 	TtyGetAttributes(fsPtr->fileState.fd, &tty);
-	sprintf(buf, "%d,%c,%d,%d", tty.baud, tty.parity, tty.data, tty.stop);
+	snprintf(buf, sizeof(buf), "%d,%c,%d,%d", tty.baud, tty.parity, tty.data, tty.stop);
 	Tcl_DStringAppendElement(dsPtr, buf);
     }
 
@@ -1028,11 +1028,11 @@ TtyGetOptionProc(
 	tcgetattr(fsPtr->fileState.fd, &iostate);
 	Tcl_DStringInit(&ds);
 
-	Tcl_ExternalToUtfDStringEx(NULL, (char *) &iostate.c_cc[VSTART], 1, TCL_ENCODING_NOCOMPLAIN, &ds);
+	Tcl_ExternalToUtfDStringEx(NULL, NULL, (char *) &iostate.c_cc[VSTART], 1, TCL_ENCODING_PROFILE_TCL8, &ds, NULL);
 	Tcl_DStringAppendElement(dsPtr, Tcl_DStringValue(&ds));
 	TclDStringClear(&ds);
 
-	Tcl_ExternalToUtfDStringEx(NULL, (char *) &iostate.c_cc[VSTOP], 1, TCL_ENCODING_NOCOMPLAIN, &ds);
+	Tcl_ExternalToUtfDStringEx(NULL, NULL, (char *) &iostate.c_cc[VSTOP], 1, TCL_ENCODING_PROFILE_TCL8, &ds, NULL);
 	Tcl_DStringAppendElement(dsPtr, Tcl_DStringValue(&ds));
 	Tcl_DStringFree(&ds);
     }
@@ -1055,9 +1055,9 @@ TtyGetOptionProc(
 	inBuffered = Tcl_InputBuffered(fsPtr->fileState.channel);
 	outBuffered = Tcl_OutputBuffered(fsPtr->fileState.channel);
 
-	sprintf(buf, "%d", inBuffered+inQueue);
+	snprintf(buf, sizeof(buf), "%d", inBuffered+inQueue);
 	Tcl_DStringAppendElement(dsPtr, buf);
-	sprintf(buf, "%d", outBuffered+outQueue);
+	snprintf(buf, sizeof(buf), "%d", outBuffered+outQueue);
 	Tcl_DStringAppendElement(dsPtr, buf);
     }
 
@@ -1096,9 +1096,9 @@ TtyGetOptionProc(
 	    }
 	    return TCL_ERROR;
 	}
-	sprintf(buf, "%d", ws.ws_col);
+	snprintf(buf, sizeof(buf), "%d", ws.ws_col);
 	Tcl_DStringAppendElement(dsPtr, buf);
-	sprintf(buf, "%d", ws.ws_row);
+	snprintf(buf, sizeof(buf), "%d", ws.ws_row);
 	Tcl_DStringAppendElement(dsPtr, buf);
     }
 #endif /* TIOCGWINSZ */
@@ -1653,13 +1653,13 @@ TclpOpenFileChannel(
 	translation = "auto crlf";
 	channelTypePtr = &ttyChannelType;
 	TtyInit(fd);
-	sprintf(channelName, "serial%d", fd);
+	snprintf(channelName, sizeof(channelName), "serial%d", fd);
     } else
 #endif	/* SUPPORTS_TTY */
     {
 	translation = NULL;
 	channelTypePtr = &fileChannelType;
-	sprintf(channelName, "file%d", fd);
+	snprintf(channelName, sizeof(channelName), "file%d", fd);
     }
 
     fsPtr = (TtyState *)Tcl_Alloc(sizeof(TtyState));
@@ -1730,7 +1730,7 @@ Tcl_MakeFileChannel(
 #ifdef SUPPORTS_TTY
     if (isatty(fd)) {
 	channelTypePtr = &ttyChannelType;
-	sprintf(channelName, "serial%d", fd);
+	snprintf(channelName, sizeof(channelName), "serial%d", fd);
     } else
 #endif /* SUPPORTS_TTY */
     if (fstat(fd, &buf) == 0 && S_ISSOCK(buf.st_mode)) {
@@ -1748,7 +1748,7 @@ Tcl_MakeFileChannel(
     } else {
     normalChannelAfterAll:
 	channelTypePtr = &fileChannelType;
-	sprintf(channelName, "file%d", fd);
+	snprintf(channelName, sizeof(channelName), "file%d", fd);
     }
 
     fsPtr = (TtyState *)Tcl_Alloc(sizeof(TtyState));
diff --git a/unix/tclUnixFCmd.c b/unix/tclUnixFCmd.c
index c9d7c45..b8911df 100644
--- a/unix/tclUnixFCmd.c
+++ b/unix/tclUnixFCmd.c
@@ -762,16 +762,16 @@ TclpObjCopyDirectory(
     Tcl_Obj *transPtr;
 
     transPtr = Tcl_FSGetTranslatedPath(NULL,srcPathPtr);
-    Tcl_UtfToExternalDStringEx(NULL,
+    Tcl_UtfToExternalDStringEx(NULL, NULL,
 	    (transPtr != NULL ? TclGetString(transPtr) : NULL),
-	    -1, TCL_ENCODING_NOCOMPLAIN, &srcString);
+	    -1, TCL_ENCODING_PROFILE_TCL8, &srcString, NULL);
     if (transPtr != NULL) {
 	Tcl_DecrRefCount(transPtr);
     }
     transPtr = Tcl_FSGetTranslatedPath(NULL,destPathPtr);
-    Tcl_UtfToExternalDStringEx(NULL,
+    Tcl_UtfToExternalDStringEx(NULL, NULL,
 	    (transPtr != NULL ? TclGetString(transPtr) : NULL),
-	    -1, TCL_ENCODING_NOCOMPLAIN, &dstString);
+	    -1, TCL_ENCODING_PROFILE_TCL8, &dstString, NULL);
     if (transPtr != NULL) {
 	Tcl_DecrRefCount(transPtr);
     }
@@ -826,9 +826,9 @@ TclpObjRemoveDirectory(
     int ret;
     Tcl_Obj *transPtr = Tcl_FSGetTranslatedPath(NULL, pathPtr);
 
-    Tcl_UtfToExternalDStringEx(NULL,
+    Tcl_UtfToExternalDStringEx(NULL, NULL,
 	    (transPtr != NULL ? TclGetString(transPtr) : NULL),
-	    -1, TCL_ENCODING_NOCOMPLAIN, &pathString);
+	    -1, TCL_ENCODING_PROFILE_TCL8, &pathString, NULL);
     if (transPtr != NULL) {
 	Tcl_DecrRefCount(transPtr);
     }
@@ -886,7 +886,7 @@ DoRemoveDirectory(
     result = TCL_OK;
     if ((errno != EEXIST) || (recursive == 0)) {
 	if (errorPtr != NULL) {
-	    Tcl_ExternalToUtfDStringEx(NULL, path, TCL_INDEX_NONE, TCL_ENCODING_NOCOMPLAIN, errorPtr);
+	    Tcl_ExternalToUtfDStringEx(NULL, NULL, path, TCL_INDEX_NONE, TCL_ENCODING_PROFILE_TCL8, errorPtr, NULL);
 	}
 	result = TCL_ERROR;
     }
@@ -1135,7 +1135,7 @@ TraverseUnixTree(
   end:
     if (errfile != NULL) {
 	if (errorPtr != NULL) {
-	    Tcl_ExternalToUtfDStringEx(NULL, errfile, TCL_INDEX_NONE, TCL_ENCODING_NOCOMPLAIN, errorPtr);
+	    Tcl_ExternalToUtfDStringEx(NULL, NULL, errfile, TCL_INDEX_NONE, TCL_ENCODING_PROFILE_TCL8, errorPtr, NULL);
 	}
 	result = TCL_ERROR;
     }
@@ -1205,8 +1205,8 @@ TraversalCopy(
      */
 
     if (errorPtr != NULL) {
-	Tcl_ExternalToUtfDStringEx(NULL, Tcl_DStringValue(dstPtr),
-		Tcl_DStringLength(dstPtr), TCL_ENCODING_NOCOMPLAIN, errorPtr);
+	Tcl_ExternalToUtfDStringEx(NULL, NULL, Tcl_DStringValue(dstPtr),
+		Tcl_DStringLength(dstPtr), TCL_ENCODING_PROFILE_TCL8, errorPtr, NULL);
     }
     return TCL_ERROR;
 }
@@ -1256,8 +1256,8 @@ TraversalDelete(
 	break;
     }
     if (errorPtr != NULL) {
-	Tcl_ExternalToUtfDStringEx(NULL, Tcl_DStringValue(srcPtr),
-		Tcl_DStringLength(srcPtr), TCL_ENCODING_NOCOMPLAIN, errorPtr);
+	Tcl_ExternalToUtfDStringEx(NULL, NULL, Tcl_DStringValue(srcPtr),
+		Tcl_DStringLength(srcPtr), TCL_ENCODING_PROFILE_TCL8, errorPtr, NULL);
     }
     return TCL_ERROR;
 }
@@ -1424,7 +1424,7 @@ GetOwnerAttribute(
     } else {
 	Tcl_DString ds;
 
-	Tcl_ExternalToUtfDStringEx(NULL, pwPtr->pw_name, TCL_INDEX_NONE, TCL_ENCODING_NOCOMPLAIN, &ds);
+	Tcl_ExternalToUtfDStringEx(NULL, NULL, pwPtr->pw_name, TCL_INDEX_NONE, TCL_ENCODING_PROFILE_TCL8, &ds, NULL);
 	*attributePtrPtr = Tcl_DStringToObj(&ds);
     }
     return TCL_OK;
@@ -2086,7 +2086,7 @@ TclpObjNormalizePath(
 	     */
 
 	    Tcl_DStringFree(&ds);
-	    Tcl_ExternalToUtfDStringEx(NULL, normPath, newNormLen, TCL_ENCODING_NOCOMPLAIN, &ds);
+	    Tcl_ExternalToUtfDStringEx(NULL, NULL, normPath, newNormLen, TCL_ENCODING_PROFILE_TCL8, &ds, NULL);
 
 	    if (path[nextCheckpoint] != '\0') {
 		/*
@@ -2179,7 +2179,7 @@ TclUnixOpenTemporaryFile(
 
     if (dirObj) {
 	string = Tcl_GetStringFromObj(dirObj, &length);
-	Tcl_UtfToExternalDStringEx(NULL, string, length, TCL_ENCODING_NOCOMPLAIN, &templ);
+	Tcl_UtfToExternalDStringEx(NULL, NULL, string, length, TCL_ENCODING_PROFILE_TCL8, &templ, NULL);
     } else {
 	Tcl_DStringInit(&templ);
 	Tcl_DStringAppend(&templ, DefaultTempDir(), TCL_INDEX_NONE); /* INTL: native */
@@ -2189,7 +2189,7 @@ TclUnixOpenTemporaryFile(
 
     if (basenameObj) {
 	string = Tcl_GetStringFromObj(basenameObj, &length);
-	Tcl_UtfToExternalDStringEx(NULL, string, length, TCL_ENCODING_NOCOMPLAIN, &tmp);
+	Tcl_UtfToExternalDStringEx(NULL, NULL, string, length, TCL_ENCODING_PROFILE_TCL8, &tmp, NULL);
 	TclDStringAppendDString(&templ, &tmp);
 	Tcl_DStringFree(&tmp);
     } else {
@@ -2201,7 +2201,7 @@ TclUnixOpenTemporaryFile(
 #ifdef HAVE_MKSTEMPS
     if (extensionObj) {
 	string = Tcl_GetStringFromObj(extensionObj, &length);
-	Tcl_UtfToExternalDStringEx(NULL, string, length, TCL_ENCODING_NOCOMPLAIN, &tmp);
+	Tcl_UtfToExternalDStringEx(NULL, NULL, string, length, TCL_ENCODING_PROFILE_TCL8, &tmp, NULL);
 	TclDStringAppendDString(&templ, &tmp);
 	fd = mkstemps(Tcl_DStringValue(&templ), Tcl_DStringLength(&tmp));
 	Tcl_DStringFree(&tmp);
@@ -2217,8 +2217,8 @@ TclUnixOpenTemporaryFile(
     }
 
     if (resultingNameObj) {
-	Tcl_ExternalToUtfDStringEx(NULL, Tcl_DStringValue(&templ),
-		Tcl_DStringLength(&templ), TCL_ENCODING_NOCOMPLAIN, &tmp);
+	Tcl_ExternalToUtfDStringEx(NULL, NULL, Tcl_DStringValue(&templ),
+		Tcl_DStringLength(&templ), TCL_ENCODING_PROFILE_TCL8, &tmp, NULL);
 	Tcl_SetStringObj(resultingNameObj, Tcl_DStringValue(&tmp),
 		Tcl_DStringLength(&tmp));
 	Tcl_DStringFree(&tmp);
@@ -2304,7 +2304,7 @@ TclpCreateTemporaryDirectory(
 
     if (dirObj) {
 	string = TclGetString(dirObj);
-	Tcl_UtfToExternalDStringEx(NULL, string, dirObj->length, TCL_ENCODING_NOCOMPLAIN, &templ);
+	Tcl_UtfToExternalDStringEx(NULL, NULL, string, dirObj->length, TCL_ENCODING_PROFILE_TCL8, &templ, NULL);
     } else {
 	Tcl_DStringInit(&templ);
 	Tcl_DStringAppend(&templ, DefaultTempDir(), TCL_INDEX_NONE); /* INTL: native */
@@ -2317,7 +2317,7 @@ TclpCreateTemporaryDirectory(
     if (basenameObj) {
 	string = TclGetString(basenameObj);
 	if (basenameObj->length) {
-	    Tcl_UtfToExternalDStringEx(NULL, string, basenameObj->length, TCL_ENCODING_NOCOMPLAIN, &tmp);
+	    Tcl_UtfToExternalDStringEx(NULL, NULL, string, basenameObj->length, TCL_ENCODING_PROFILE_TCL8, &tmp, NULL);
 	    TclDStringAppendDString(&templ, &tmp);
 	    Tcl_DStringFree(&tmp);
 	} else {
@@ -2342,8 +2342,8 @@ TclpCreateTemporaryDirectory(
      * The template has been updated. Tell the caller what it was.
      */
 
-    Tcl_ExternalToUtfDStringEx(NULL, Tcl_DStringValue(&templ),
-	    Tcl_DStringLength(&templ), TCL_ENCODING_NOCOMPLAIN, &tmp);
+    Tcl_ExternalToUtfDStringEx(NULL, NULL, Tcl_DStringValue(&templ),
+	    Tcl_DStringLength(&templ), TCL_ENCODING_PROFILE_TCL8, &tmp, NULL);
     Tcl_DStringFree(&templ);
     return Tcl_DStringToObj(&tmp);
 }
diff --git a/unix/tclUnixFile.c b/unix/tclUnixFile.c
index 830ed6f..b21de07 100644
--- a/unix/tclUnixFile.c
+++ b/unix/tclUnixFile.c
@@ -153,7 +153,7 @@ TclpFindExecutable(
 #endif
     {
 	encoding = Tcl_GetEncoding(NULL, NULL);
-	Tcl_ExternalToUtfDStringEx(encoding, name, TCL_INDEX_NONE, TCL_ENCODING_NOCOMPLAIN, &utfName);
+	Tcl_ExternalToUtfDStringEx(NULL, encoding, name, TCL_INDEX_NONE, TCL_ENCODING_PROFILE_TCL8, &utfName, NULL);
 	TclSetObjNameOfExecutable(
 		Tcl_NewStringObj(Tcl_DStringValue(&utfName), TCL_INDEX_NONE), encoding);
 	Tcl_DStringFree(&utfName);
@@ -179,8 +179,8 @@ TclpFindExecutable(
     Tcl_DStringAppend(&nameString, name, TCL_INDEX_NONE);
 
     Tcl_DStringFree(&buffer);
-    Tcl_UtfToExternalDStringEx(NULL, Tcl_DStringValue(&cwd),
-	    Tcl_DStringLength(&cwd), TCL_ENCODING_NOCOMPLAIN, &buffer);
+    Tcl_UtfToExternalDStringEx(NULL, NULL, Tcl_DStringValue(&cwd),
+	    Tcl_DStringLength(&cwd), TCL_ENCODING_PROFILE_TCL8, &buffer, NULL);
     if (Tcl_DStringValue(&cwd)[Tcl_DStringLength(&cwd) -1] != '/') {
 	TclDStringAppendLiteral(&buffer, "/");
     }
@@ -189,8 +189,8 @@ TclpFindExecutable(
     Tcl_DStringFree(&nameString);
 
     encoding = Tcl_GetEncoding(NULL, NULL);
-    Tcl_ExternalToUtfDStringEx(encoding, Tcl_DStringValue(&buffer), TCL_INDEX_NONE,
-	    TCL_ENCODING_NOCOMPLAIN, &utfName);
+    Tcl_ExternalToUtfDStringEx(NULL, encoding, Tcl_DStringValue(&buffer), TCL_INDEX_NONE,
+	    TCL_ENCODING_PROFILE_TCL8, &utfName, NULL);
     TclSetObjNameOfExecutable(
 	    Tcl_NewStringObj(Tcl_DStringValue(&utfName), TCL_INDEX_NONE), encoding);
     Tcl_DStringFree(&utfName);
@@ -709,9 +709,9 @@ TclpObjLstat(
  *----------------------------------------------------------------------
  */
 
-ClientData
+void *
 TclpGetNativeCwd(
-    ClientData clientData)
+    void *clientData)
 {
     char buffer[MAXPATHLEN+1];
 
@@ -813,7 +813,7 @@ TclpReadlink(
 {
 #ifndef DJGPP
     char link[MAXPATHLEN];
-    int length;
+    ssize_t length;
     const char *native;
     Tcl_DString ds;
 
@@ -825,7 +825,7 @@ TclpReadlink(
 	return NULL;
     }
 
-    Tcl_ExternalToUtfDStringEx(NULL, link, length, TCL_ENCODING_NOCOMPLAIN, linkPtr);
+    Tcl_ExternalToUtfDStringEx(NULL, NULL, link, (size_t)length, TCL_ENCODING_PROFILE_TCL8, linkPtr, NULL);
     return Tcl_DStringValue(linkPtr);
 #else
     return NULL;
@@ -979,7 +979,7 @@ TclpObjLink(
 	Tcl_Obj *linkPtr = NULL;
 
 	char link[MAXPATHLEN];
-	int length;
+	ssize_t length;
 	Tcl_DString ds;
 	Tcl_Obj *transPtr;
 
@@ -994,7 +994,7 @@ TclpObjLink(
 	    return NULL;
 	}
 
-	Tcl_ExternalToUtfDStringEx(NULL, link, length, TCL_ENCODING_NOCOMPLAIN, &ds);
+	Tcl_ExternalToUtfDStringEx(NULL, NULL, link, (size_t)length, TCL_ENCODING_PROFILE_TCL8, &ds, NULL);
 	linkPtr = Tcl_DStringToObj(&ds);
 	Tcl_IncrRefCount(linkPtr);
 	return linkPtr;
@@ -1055,11 +1055,11 @@ TclpFilesystemPathType(
 
 Tcl_Obj *
 TclpNativeToNormalized(
-    ClientData clientData)
+    void *clientData)
 {
     Tcl_DString ds;
 
-    Tcl_ExternalToUtfDStringEx(NULL, (const char *) clientData, TCL_INDEX_NONE, TCL_ENCODING_NOCOMPLAIN, &ds);
+    Tcl_ExternalToUtfDStringEx(NULL, NULL, (const char *) clientData, TCL_INDEX_NONE, TCL_ENCODING_PROFILE_TCL8, &ds, NULL);
     return Tcl_DStringToObj(&ds);
 }
 
@@ -1079,7 +1079,7 @@ TclpNativeToNormalized(
  *---------------------------------------------------------------------------
  */
 
-ClientData
+void *
 TclNativeCreateNativeRep(
     Tcl_Obj *pathPtr)
 {
@@ -1113,7 +1113,7 @@ TclNativeCreateNativeRep(
     }
 
     str = Tcl_GetStringFromObj(validPathPtr, &len);
-    Tcl_UtfToExternalDStringEx(NULL, str, len, TCL_ENCODING_NOCOMPLAIN, &ds);
+    Tcl_UtfToExternalDStringEx(NULL, NULL, str, len, TCL_ENCODING_PROFILE_TCL8, &ds, NULL);
     len = Tcl_DStringLength(&ds) + sizeof(char);
     if (strlen(Tcl_DStringValue(&ds)) < len - sizeof(char)) {
 	/* See bug [3118489]: NUL in filenames */
@@ -1146,9 +1146,9 @@ TclNativeCreateNativeRep(
  *---------------------------------------------------------------------------
  */
 
-ClientData
+void *
 TclNativeDupInternalRep(
-    ClientData clientData)
+    void *clientData)
 {
     char *copy;
     size_t len;
diff --git a/unix/tclUnixInit.c b/unix/tclUnixInit.c
index 8f7a737..9724639 100644
--- a/unix/tclUnixInit.c
+++ b/unix/tclUnixInit.c
@@ -473,7 +473,7 @@ TclpInitLibraryPath(
      */
 
     str = getenv("TCL_LIBRARY");			/* INTL: Native. */
-    Tcl_ExternalToUtfDStringEx(NULL, str, TCL_INDEX_NONE, TCL_ENCODING_NOCOMPLAIN, &buffer);
+    Tcl_ExternalToUtfDStringEx(NULL, NULL, str, TCL_INDEX_NONE, TCL_ENCODING_PROFILE_TCL8, &buffer, NULL);
     str = Tcl_DStringValue(&buffer);
 
     if ((str != NULL) && (str[0] != '\0')) {
@@ -490,7 +490,7 @@ TclpInitLibraryPath(
 	 * installed.
 	 */
 
-	sprintf(installLib, "lib/tcl%s", TCL_VERSION);
+	snprintf(installLib, sizeof(installLib), "lib/tcl%s", TCL_VERSION);
 
 	/*
 	 * If TCL_LIBRARY is set, search there.
@@ -901,7 +901,7 @@ TclpSetVariables(
 	osInfo.dwMajorVersion = 11;
     }
     Tcl_SetVar2(interp, "tcl_platform", "os", "Windows NT", TCL_GLOBAL_ONLY);
-    sprintf(buffer, "%d.%d", osInfo.dwMajorVersion, osInfo.dwMinorVersion);
+    snprintf(buffer, sizeof(buffer), "%d.%d", osInfo.dwMajorVersion, osInfo.dwMinorVersion);
     Tcl_SetVar2(interp, "tcl_platform", "osVersion", buffer, TCL_GLOBAL_ONLY);
     if (sysInfo.wProcessorArchitecture < NUMPROCESSORS) {
 	Tcl_SetVar2(interp, "tcl_platform", "machine",
diff --git a/unix/tclUnixNotfy.c b/unix/tclUnixNotfy.c
index 943e7d7..6ecde5d 100644
--- a/unix/tclUnixNotfy.c
+++ b/unix/tclUnixNotfy.c
@@ -27,7 +27,7 @@ static int		FileHandlerEventProc(Tcl_Event *evPtr, int flags);
 # define NOTIFIER_SELECT
 #elif !defined(NOTIFIER_EPOLL) && !defined(NOTIFIER_KQUEUE)
 # define NOTIFIER_SELECT
-static TCL_NORETURN void NotifierThreadProc(ClientData clientData);
+static TCL_NORETURN void NotifierThreadProc(void *clientData);
 # if defined(HAVE_PTHREAD_ATFORK)
 static void		AtForkChild(void);
 # endif /* HAVE_PTHREAD_ATFORK */
@@ -497,13 +497,13 @@ AtForkChild(void)
  *----------------------------------------------------------------------
  */
 
-ClientData
+void *
 TclpNotifierData(void)
 {
 #if defined(NOTIFIER_EPOLL) || defined(NOTIFIER_KQUEUE)
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
 
-    return (ClientData) tsdPtr;
+    return (void *) tsdPtr;
 #else
     return NULL;
 #endif
diff --git a/unix/tclUnixPipe.c b/unix/tclUnixPipe.c
index 0692df5..19127d2 100644
--- a/unix/tclUnixPipe.c
+++ b/unix/tclUnixPipe.c
@@ -476,7 +476,7 @@ TclpCreateProcess(
 		|| (!joinThisError && !SetupStdFile(errorFile, TCL_STDERR))
 		|| (joinThisError &&
 			((dup2(1,2) == -1) || (fcntl(2, F_SETFD, 0) != 0)))) {
-	    sprintf(errSpace,
+	    snprintf(errSpace, sizeof(errSpace),
 		    "%dforked process couldn't set up input/output", errno);
 	    len = strlen(errSpace);
 	    if (len != (size_t) write(fd, errSpace, len)) {
@@ -491,7 +491,7 @@ TclpCreateProcess(
 
 	RestoreSignals();
 	execvp(newArgv[0], newArgv);			/* INTL: Native. */
-	sprintf(errSpace, "%dcouldn't execute \"%.150s\"", errno, argv[0]);
+	snprintf(errSpace, sizeof(errSpace), "%dcouldn't execute \"%.150s\"", errno, argv[0]);
 	len = strlen(errSpace);
 	if (len != (size_t) write(fd, errSpace, len)) {
 	    Tcl_Panic("TclpCreateProcess: unable to write to errPipeOut");
@@ -783,7 +783,7 @@ TclpCreateCommandChannel(
      * natural to use "pipe%d".
      */
 
-    sprintf(channelName, "file%d", channelId);
+    snprintf(channelName, sizeof(channelName), "file%d", channelId);
     statePtr->channel = Tcl_CreateChannel(&pipeChannelType, channelName,
 	    statePtr, mode);
     return statePtr->channel;
diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c
index 864d477..dec3833 100644
--- a/unix/tclUnixSock.c
+++ b/unix/tclUnixSock.c
@@ -1030,10 +1030,10 @@ TcpGetOptionProc(
 
     if ((len == 0) || ((len > 1) && (optionName[1] == 'k') &&
 	    (strncmp(optionName, "-keepalive", len) == 0))) {
+	int opt = 0;
 #if defined(SO_KEEPALIVE)
-	socklen_t size;
+	socklen_t size = sizeof(opt);
 #endif
-	int opt = 0;
 
 	if (len == 0) {
 	    Tcl_DStringAppendElement(dsPtr, "-keepalive");
@@ -1050,10 +1050,10 @@ TcpGetOptionProc(
 
     if ((len == 0) || ((len > 1) && (optionName[1] == 'n') &&
 	    (strncmp(optionName, "-nodelay", len) == 0))) {
+	int opt = 0;
 #if defined(SOL_TCP) && defined(TCP_NODELAY)
-	socklen_t size;
+	socklen_t size = sizeof(opt);
 #endif
-	int opt = 0;
 
 	if (len == 0) {
 	    Tcl_DStringAppendElement(dsPtr, "-nodelay");
@@ -1545,7 +1545,7 @@ Tcl_OpenTcpClient(
         return NULL;
     }
 
-    sprintf(channelName, SOCK_TEMPLATE, PTR2INT(statePtr));
+    snprintf(channelName, sizeof(channelName), SOCK_TEMPLATE, PTR2INT(statePtr));
 
     statePtr->channel = Tcl_CreateChannel(&tcpChannelType, channelName,
             statePtr, TCL_READABLE | TCL_WRITABLE);
@@ -1612,7 +1612,7 @@ TclpMakeTcpClientChannelMode(
     statePtr->fds.fd = PTR2INT(sock);
     statePtr->flags = 0;
 
-    sprintf(channelName, SOCK_TEMPLATE, PTR2INT(statePtr));
+    snprintf(channelName, sizeof(channelName), SOCK_TEMPLATE, PTR2INT(statePtr));
 
     statePtr->channel = Tcl_CreateChannel(&tcpChannelType, channelName,
 	    statePtr, mode);
@@ -1838,7 +1838,7 @@ Tcl_OpenTcpServerEx(
             memset(statePtr, 0, sizeof(TcpState));
             statePtr->acceptProc = acceptProc;
             statePtr->acceptProcData = acceptProcData;
-            sprintf(channelName, SOCK_TEMPLATE, PTR2INT(statePtr));
+            snprintf(channelName, sizeof(channelName), SOCK_TEMPLATE, PTR2INT(statePtr));
             newfds = &statePtr->fds;
         } else {
             newfds = (TcpFdList *)Tcl_Alloc(sizeof(TcpFdList));
@@ -1930,7 +1930,7 @@ TcpAccept(
     newSockState->flags = 0;
     newSockState->fds.fd = newsock;
 
-    sprintf(channelName, SOCK_TEMPLATE, PTR2INT(newSockState));
+    snprintf(channelName, sizeof(channelName), SOCK_TEMPLATE, PTR2INT(newSockState));
     newSockState->channel = Tcl_CreateChannel(&tcpChannelType, channelName,
 	    newSockState, TCL_READABLE | TCL_WRITABLE);
 
diff --git a/unix/tclUnixTest.c b/unix/tclUnixTest.c
index ccb9105..b482464 100644
--- a/unix/tclUnixTest.c
+++ b/unix/tclUnixTest.c
@@ -190,7 +190,7 @@ TestfilehandlerCmd(
 	    Tcl_WrongNumArgs(interp, 2, objv, "index");
 	    return TCL_ERROR;
 	}
-	sprintf(buf, "%d %d", pipePtr->readCount, pipePtr->writeCount);
+	snprintf(buf, sizeof(buf), "%d %d", pipePtr->readCount, pipePtr->writeCount);
 	Tcl_AppendResult(interp, buf, NULL);
     } else if (strcmp(Tcl_GetString(objv[1]), "create") == 0) {
 	if (objc != 5) {
diff --git a/unix/tclUnixThrd.c b/unix/tclUnixThrd.c
index 36f0648..cf3b7a1 100644
--- a/unix/tclUnixThrd.c
+++ b/unix/tclUnixThrd.c
@@ -213,7 +213,7 @@ int
 TclpThreadCreate(
     Tcl_ThreadId *idPtr,	/* Return, the ID of the thread */
     Tcl_ThreadCreateProc *proc,	/* Main() function of the thread */
-    ClientData clientData,	/* The one argument to Main() */
+    void *clientData,	/* The one argument to Main() */
     size_t stackSize,		/* Size of stack for the new thread */
     int flags)			/* Flags controlling behaviour of the new
 				 * thread. */
diff --git a/unix/tclUnixTime.c b/unix/tclUnixTime.c
index 7830dc8..eae7177 100644
--- a/unix/tclUnixTime.c
+++ b/unix/tclUnixTime.c
@@ -104,7 +104,7 @@ TclpGetMicroseconds(void)
  * TclpGetClicks --
  *
  *	This procedure returns a value that represents the highest resolution
- *	clock available on the system. There are no garantees on what the
+ *	clock available on the system. There are no guarantees on what the
  *	resolution will be. In Tcl we will call this value a "click". The
  *	start time is also system dependent.
  *
diff --git a/win/Makefile.in b/win/Makefile.in
index 32a2960..2255681 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -924,8 +924,8 @@ install-libraries: libraries install-tzdata install-msgs
 	    done;
 	@echo "Installing package msgcat 1.7.1 as a Tcl Module";
 	@$(COPY) $(ROOT_DIR)/library/msgcat/msgcat.tcl "$(MODULE_INSTALL_DIR)/9.0/msgcat-1.7.1.tm";
-	@echo "Installing package tcltest 2.5.5 as a Tcl Module";
-	@$(COPY) $(ROOT_DIR)/library/tcltest/tcltest.tcl "$(MODULE_INSTALL_DIR)/9.0/tcltest-2.5.5.tm";
+	@echo "Installing package tcltest 2.5.6 as a Tcl Module";
+	@$(COPY) $(ROOT_DIR)/library/tcltest/tcltest.tcl "$(MODULE_INSTALL_DIR)/9.0/tcltest-2.5.6.tm";
 	@echo "Installing package platform 1.0.19 as a Tcl Module";
 	@$(COPY) $(ROOT_DIR)/library/platform/platform.tcl "$(MODULE_INSTALL_DIR)/9.0/platform-1.0.19.tm";
 	@echo "Installing package platform::shell 1.1.4 as a Tcl Module";
diff --git a/win/tclWin32Dll.c b/win/tclWin32Dll.c
index 2836e4f..01fa6c3 100644
--- a/win/tclWin32Dll.c
+++ b/win/tclWin32Dll.c
@@ -379,7 +379,7 @@ TclWinDriveLetterForVolMountPoint(
 	    if (!alreadyStored) {
 		dlPtr2 = (MountPointMap *)Tcl_Alloc(sizeof(MountPointMap));
 		dlPtr2->volumeName = (WCHAR *)TclNativeDupInternalRep(Target);
-		dlPtr2->driveLetter = (char) drive[0];
+		dlPtr2->driveLetter = (WCHAR) drive[0];
 		dlPtr2->nextPtr = driveLetterLookup;
 		driveLetterLookup = dlPtr2;
 	    }
@@ -405,7 +405,7 @@ TclWinDriveLetterForVolMountPoint(
 
     dlPtr2 = (MountPointMap *)Tcl_Alloc(sizeof(MountPointMap));
     dlPtr2->volumeName = (WCHAR *)TclNativeDupInternalRep((void *)mountPoint);
-    dlPtr2->driveLetter = -1;
+    dlPtr2->driveLetter = (WCHAR)-1;
     dlPtr2->nextPtr = driveLetterLookup;
     driveLetterLookup = dlPtr2;
     Tcl_MutexUnlock(&mountPointMap);
diff --git a/win/tclWinChan.c b/win/tclWinChan.c
index 4968802..7d1f849 100644
--- a/win/tclWinChan.c
+++ b/win/tclWinChan.c
@@ -95,6 +95,8 @@ static int		FileTruncateProc(void *instanceData,
 			    long long length);
 static DWORD		FileGetType(HANDLE handle);
 static int		NativeIsComPort(const WCHAR *nativeName);
+static Tcl_Channel OpenFileChannel(HANDLE handle, char *channelName,
+			    int permissions, int appendMode);
 
 /*
  * This structure describes the channel type structure for file based IO.
@@ -613,7 +615,7 @@ FileInputProc(
 
     if (ReadFile(infoPtr->handle, (LPVOID) buf, (DWORD) bufSize, &bytesRead,
 	    (LPOVERLAPPED) NULL) != FALSE) {
-	return bytesRead;
+	return (int)bytesRead;
     }
 
     Tcl_WinConvertError(GetLastError());
@@ -670,7 +672,7 @@ FileOutputProc(
 	return -1;
     }
     infoPtr->dirty = 1;
-    return bytesWritten;
+    return (int)bytesWritten;
 }
 
 /*
@@ -948,7 +950,7 @@ TclpOpenFileChannel(
     case FILE_TYPE_CHAR:
     case FILE_TYPE_DISK:
     case FILE_TYPE_UNKNOWN:
-	channel = TclWinOpenFileChannel(handle, channelName,
+	channel = OpenFileChannel(handle, channelName,
 		channelPermissions,
 		TEST_FLAG(mode, O_APPEND) ? FILE_APPEND : 0);
 	break;
@@ -1026,7 +1028,7 @@ Tcl_MakeFileChannel(
 
     case FILE_TYPE_DISK:
     case FILE_TYPE_CHAR:
-	channel = TclWinOpenFileChannel(handle, channelName, mode, 0);
+	channel = OpenFileChannel(handle, channelName, mode, 0);
 	break;
 
     case FILE_TYPE_UNKNOWN:
@@ -1160,7 +1162,7 @@ Tcl_MakeFileChannel(
 	 * is valid to something.
 	 */
 
-	channel = TclWinOpenFileChannel(handle, channelName, mode, 0);
+	channel = OpenFileChannel(handle, channelName, mode, 0);
     }
 
     return channel;
@@ -1248,7 +1250,7 @@ TclpGetDefaultStdChannel(
 /*
  *----------------------------------------------------------------------
  *
- * TclWinOpenFileChannel --
+ * OpenFileChannel --
  *
  *	Constructs a File channel for the specified standard OS handle. This
  *	is a helper function to break up the construction of channels into
@@ -1265,7 +1267,7 @@ TclpGetDefaultStdChannel(
  */
 
 Tcl_Channel
-TclWinOpenFileChannel(
+OpenFileChannel(
     HANDLE handle,		/* Win32 HANDLE to swallow */
     char *channelName,		/* Buffer to receive channel name */
     int permissions,		/* OR'ed combination of TCL_READABLE,
@@ -1303,7 +1305,7 @@ TclWinOpenFileChannel(
     infoPtr->flags = appendMode;
     infoPtr->handle = handle;
     infoPtr->dirty = 0;
-    sprintf(channelName, "file%" TCL_Z_MODIFIER "x", (size_t) infoPtr);
+    snprintf(channelName, 16 + TCL_INTEGER_SPACE, "file%" TCL_Z_MODIFIER "x", (size_t) infoPtr);
 
     infoPtr->channel = Tcl_CreateChannel(&fileChannelType, channelName,
 	    infoPtr, permissions);
@@ -1483,7 +1485,7 @@ NativeIsComPort(
     const WCHAR *nativePath)	/* Path of file to access, native encoding. */
 {
     const WCHAR *p = (const WCHAR *) nativePath;
-    int i, len = wcslen(p);
+    size_t i, len = wcslen(p);
 
     /*
      * 1. Look for com[1-9]:?
diff --git a/win/tclWinConsole.c b/win/tclWinConsole.c
index 9f6cadf..4b49b7a 100644
--- a/win/tclWinConsole.c
+++ b/win/tclWinConsole.c
@@ -882,8 +882,7 @@ ConsoleCheckProc(
 	     */
 	    handleInfoPtr->flags |= CONSOLE_DATA_AWAITED;
 	    WakeConditionVariable(&handleInfoPtr->consoleThreadCV);
-	}
-	else if (chanInfoPtr->watchMask & TCL_WRITABLE) {
+	} else if (chanInfoPtr->watchMask & TCL_WRITABLE) {
 	    if (RingBufferHasFreeSpace(&handleInfoPtr->buffer)) {
 		needEvent = 1; /* Output space available */
 	    }
@@ -2124,7 +2123,7 @@ TclWinOpenConsoleChannel(
      * for instance).
      */
 
-    sprintf(channelName, "file%" TCL_Z_MODIFIER "x", (size_t) chanInfoPtr);
+    snprintf(channelName, 16 + TCL_INTEGER_SPACE, "file%" TCL_Z_MODIFIER "x", (size_t) chanInfoPtr);
 
     if (permissions & TCL_READABLE) {
 	/*
@@ -2420,11 +2419,11 @@ ConsoleGetOptionProc(
 		return TCL_ERROR;
 	    }
 	    Tcl_DStringStartSublist(dsPtr);
-	    sprintf(buf,
+	    snprintf(buf, sizeof(buf),
 		    "%d",
 		    consoleInfo.srWindow.Right - consoleInfo.srWindow.Left + 1);
 	    Tcl_DStringAppendElement(dsPtr, buf);
-	    sprintf(buf,
+	    snprintf(buf, sizeof(buf),
 		    "%d",
 		    consoleInfo.srWindow.Bottom - consoleInfo.srWindow.Top + 1);
 	    Tcl_DStringAppendElement(dsPtr, buf);
diff --git a/win/tclWinFile.c b/win/tclWinFile.c
index 4c63222..b16a707 100644
--- a/win/tclWinFile.c
+++ b/win/tclWinFile.c
@@ -170,7 +170,7 @@ static int		NativeWriteReparse(const WCHAR *LinkDirectory,
 static int		NativeMatchType(int isDrive, DWORD attr,
 			    const WCHAR *nativeName, Tcl_GlobTypeData *types);
 static int		WinIsDrive(const char *name, size_t nameLen);
-static Tcl_Size		WinIsReserved(const char *path);
+static size_t		WinIsReserved(const char *path);
 static Tcl_Obj *	WinReadLink(const WCHAR *LinkSource);
 static Tcl_Obj *	WinReadLinkDirectory(const WCHAR *LinkDirectory);
 static int		WinLink(const WCHAR *LinkSource,
@@ -921,7 +921,7 @@ TclpMatchInDirectory(
 
 	    DWORD attr;
 	    WIN32_FILE_ATTRIBUTE_DATA data;
-	    Tcl_Size len = 0;
+	    size_t len = 0;
 	    const char *str = Tcl_GetStringFromObj(norm, &len);
 
 	    native = (const WCHAR *)Tcl_FSGetNativePath(pathPtr);
@@ -943,7 +943,7 @@ TclpMatchInDirectory(
 	WIN32_FIND_DATAW data;
 	const char *dirName;	/* UTF-8 dir name, later with pattern
 				 * appended. */
-	Tcl_Size dirLength;
+	size_t dirLength;
 	int matchSpecialDots;
 	Tcl_DString ds;		/* Native encoding of dir, also used
 				 * temporarily for other things. */
@@ -1226,7 +1226,7 @@ WinIsDrive(
  * (not any trailing :).
  */
 
-static Tcl_Size
+static size_t
 WinIsReserved(
     const char *path)		/* Path in UTF-8 */
 {
@@ -2560,14 +2560,14 @@ TclpObjNormalizePath(
 		 */
 
 		if (isDrive) {
-		    Tcl_Size len = WinIsReserved(path);
+		    size_t len = WinIsReserved(path);
 
 		    if (len > 0) {
 			/*
 			 * Actually it does exist - COM1, etc.
 			 */
 
-			Tcl_Size i;
+			size_t i;
 
 			for (i=0 ; i<len ; i++) {
 			    WCHAR wc = ((WCHAR *)nativePath)[i];
@@ -2796,7 +2796,7 @@ TclpObjNormalizePath(
 	     */
 
 	    Tcl_Obj *tmpPathPtr;
-	    Tcl_Size len;
+	    size_t len;
 
 	    tmpPathPtr = Tcl_NewStringObj(Tcl_DStringValue(&ds),
 		    nextCheckpoint);
@@ -2885,7 +2885,7 @@ TclWinVolumeRelativeNormalize(
 	 * also on drive C.
 	 */
 
-	Tcl_Size cwdLen;
+	size_t cwdLen;
 	const char *drive = Tcl_GetStringFromObj(useThisCwd, &cwdLen);
 	char drive_cur = path[0];
 
@@ -2959,7 +2959,7 @@ TclpNativeToNormalized(
 {
     Tcl_DString ds;
     Tcl_Obj *objPtr;
-    Tcl_Size len;
+    size_t len;
     char *copy, *p;
 
     Tcl_DStringInit(&ds);
@@ -3022,7 +3022,7 @@ TclNativeCreateNativeRep(
     WCHAR *nativePathPtr = NULL;
     const char *str;
     Tcl_Obj *validPathPtr;
-    Tcl_Size len;
+    size_t len;
     WCHAR *wp;
 
     if (TclFSCwdIsNative()) {
diff --git a/win/tclWinInit.c b/win/tclWinInit.c
index cf74228..d44e58c 100644
--- a/win/tclWinInit.c
+++ b/win/tclWinInit.c
@@ -141,7 +141,7 @@ TclpInitLibraryPath(
      * installed DLL.
      */
 
-    sprintf(installLib, "lib/tcl%s", TCL_VERSION);
+    snprintf(installLib, sizeof(installLib), "lib/tcl%s", TCL_VERSION);
 
     /*
      * Look for the library relative to the TCL_LIBRARY env variable. If the
@@ -304,7 +304,7 @@ InitializeDefaultLibraryDir(
     *end = '\\';
 
     TclWinNoBackslash(name);
-    sprintf(end + 1, "lib/tcl%s", TCL_VERSION);
+    snprintf(end + 1, LIBRARY_SIZE, "lib/tcl%s", TCL_VERSION);
     *lengthPtr = strlen(name);
     *valuePtr = (char *)Tcl_Alloc(*lengthPtr + 1);
     *encodingPtr = NULL;
@@ -352,7 +352,7 @@ InitializeSourceLibraryDir(
     *end = '\\';
 
     TclWinNoBackslash(name);
-    sprintf(end + 1, "../library");
+    snprintf(end + 1, LIBRARY_SIZE, "../library");
     *lengthPtr = strlen(name);
     *valuePtr = (char *)Tcl_Alloc(*lengthPtr + 1);
     *encodingPtr = NULL;
@@ -404,7 +404,7 @@ Tcl_GetEncodingNameFromEnvironment(
 	Tcl_DStringAppend(bufPtr, "utf-8", 5);
     } else {
 	Tcl_DStringSetLength(bufPtr, 2+TCL_INTEGER_SPACE);
-	wsprintfA(Tcl_DStringValue(bufPtr), "cp%d", GetACP());
+	snprintf(Tcl_DStringValue(bufPtr), 2+TCL_INTEGER_SPACE, "cp%d", GetACP());
 	Tcl_DStringSetLength(bufPtr, strlen(Tcl_DStringValue(bufPtr)));
     }
     return Tcl_DStringValue(bufPtr);
@@ -488,7 +488,7 @@ TclpSetVariables(
     if (osInfo.dwMajorVersion == 10 && osInfo.dwBuildNumber >= 22000) {
 	osInfo.dwMajorVersion = 11;
     }
-    wsprintfA(buffer, "%d.%d", osInfo.dwMajorVersion, osInfo.dwMinorVersion);
+    snprintf(buffer, sizeof(buffer), "%ld.%ld", osInfo.dwMajorVersion, osInfo.dwMinorVersion);
     Tcl_SetVar2(interp, "tcl_platform", "osVersion", buffer, TCL_GLOBAL_ONLY);
     if (sys.oemId.wProcessorArchitecture < NUMPROCESSORS) {
 	Tcl_SetVar2(interp, "tcl_platform", "machine",
diff --git a/win/tclWinInt.h b/win/tclWinInt.h
index d3d6680..1267f3f 100644
--- a/win/tclWinInt.h
+++ b/win/tclWinInt.h
@@ -43,8 +43,6 @@ MODULE_SCOPE void	TclWinInit(HINSTANCE hInst);
 MODULE_SCOPE TclFile	TclWinMakeFile(HANDLE handle);
 MODULE_SCOPE Tcl_Channel TclWinOpenConsoleChannel(HANDLE handle,
 			    char *channelName, int permissions);
-MODULE_SCOPE Tcl_Channel TclWinOpenFileChannel(HANDLE handle, char *channelName,
-			    int permissions, int appendMode);
 MODULE_SCOPE Tcl_Channel TclWinOpenSerialChannel(HANDLE handle,
 			    char *channelName, int permissions);
 MODULE_SCOPE HANDLE	TclWinSerialOpen(HANDLE handle, const WCHAR *name,
diff --git a/win/tclWinLoad.c b/win/tclWinLoad.c
index ccedb9d..893313c 100644
--- a/win/tclWinLoad.c
+++ b/win/tclWinLoad.c
@@ -175,7 +175,7 @@ TclpDlopen(
      */
 
     handlePtr = (Tcl_LoadHandle)Tcl_Alloc(sizeof(struct Tcl_LoadHandle_));
-    handlePtr->clientData = (ClientData) hInstance;
+    handlePtr->clientData = (void *)hInstance;
     handlePtr->findSymbolProcPtr = &FindSymbol;
     handlePtr->unloadFileProcPtr = &UnloadFile;
     *loadHandle = handlePtr;
diff --git a/win/tclWinNotify.c b/win/tclWinNotify.c
index ec6fd51..bcb4e08 100644
--- a/win/tclWinNotify.c
+++ b/win/tclWinNotify.c
@@ -76,7 +76,7 @@ static LRESULT CALLBACK		NotifierProc(HWND hwnd, UINT message,
  *----------------------------------------------------------------------
  */
 
-ClientData
+void *
 TclpInitNotifier(void)
 {
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
@@ -148,7 +148,7 @@ TclpInitNotifier(void)
 
 void
 TclpFinalizeNotifier(
-    ClientData clientData)	/* Pointer to notifier data. */
+    void *clientData)	/* Pointer to notifier data. */
 {
     ThreadSpecificData *tsdPtr = (ThreadSpecificData *) clientData;
 
@@ -218,7 +218,7 @@ TclpFinalizeNotifier(
 
 void
 TclpAlertNotifier(
-    ClientData clientData)	/* Pointer to thread data. */
+    void *clientData)	/* Pointer to thread data. */
 {
     ThreadSpecificData *tsdPtr = (ThreadSpecificData *) clientData;
 
@@ -287,7 +287,7 @@ TclpSetTimer(
 	 * Windows seems to get confused by zero length timers.
 	 */
 
-	timeout = timePtr->sec * 1000 + timePtr->usec / 1000;
+	timeout = (UINT)timePtr->sec * 1000 + (unsigned long)timePtr->usec / 1000;
 	if (timeout == 0) {
 	    timeout = 1;
 	}
@@ -437,7 +437,7 @@ NotifierProc(
  *----------------------------------------------------------------------
  */
 
-ClientData
+void *
 TclpNotifierData(void)
 {
     return NULL;
@@ -490,7 +490,7 @@ TclpWaitForEvent(
 	    TclScaleTime(&myTime);
 	}
 
-	timeout = myTime.sec * 1000 + myTime.usec / 1000;
+	timeout = (DWORD)myTime.sec * 1000 + (unsigned long)myTime.usec / 1000;
     } else {
 	timeout = INFINITE;
     }
@@ -610,7 +610,7 @@ Tcl_Sleep(
      */
 
     TclScaleTime(&vdelay);
-    sleepTime = vdelay.sec * 1000 + vdelay.usec / 1000;
+    sleepTime = (DWORD)vdelay.sec * 1000 + (unsigned long)vdelay.usec / 1000;
 
     for (;;) {
 	SleepEx(sleepTime, TRUE);
@@ -625,7 +625,7 @@ Tcl_Sleep(
 	vdelay.usec = desired.usec - now.usec;
 
 	TclScaleTime(&vdelay);
-	sleepTime = vdelay.sec * 1000 + vdelay.usec / 1000;
+	sleepTime = (DWORD)vdelay.sec * 1000 + (unsigned long)vdelay.usec / 1000;
     }
 }
 
diff --git a/win/tclWinPanic.c b/win/tclWinPanic.c
index 7c21167..7928dcd 100644
--- a/win/tclWinPanic.c
+++ b/win/tclWinPanic.c
@@ -56,10 +56,10 @@ Tcl_ConsolePanic(
     if (IsDebuggerPresent()) {
 	OutputDebugStringW(msgString);
     } else if (_isatty(2)) {
-	WriteConsoleW(handle, msgString, wcslen(msgString), &dummy, 0);
+	WriteConsoleW(handle, msgString, (DWORD)wcslen(msgString), &dummy, 0);
     } else {
 	buf[0] = '\xEF'; buf[1] = '\xBB'; buf[2] = '\xBF'; /* UTF-8 bom */
-	WriteFile(handle, buf, strlen(buf), &dummy, 0);
+	WriteFile(handle, buf, (DWORD)strlen(buf), &dummy, 0);
 	WriteFile(handle, "\n", 1, &dummy, 0);
 	FlushFileBuffers(handle);
     }
diff --git a/win/tclWinPipe.c b/win/tclWinPipe.c
index b7949d1..bf78aef 100644
--- a/win/tclWinPipe.c
+++ b/win/tclWinPipe.c
@@ -104,7 +104,7 @@ typedef struct PipeInfo {
     TclFile readFile;		/* Output from pipe. */
     TclFile writeFile;		/* Input from pipe. */
     TclFile errorFile;		/* Error output from pipe. */
-    Tcl_Size numPids;		/* Number of processes attached to pipe. */
+    size_t numPids;		/* Number of processes attached to pipe. */
     Tcl_Pid *pidPtr;		/* Pids of attached processes. */
     Tcl_ThreadId threadId;	/* Thread to which events should be reported.
 				 * This value is used by the reader/writer
@@ -171,7 +171,7 @@ typedef struct {
 
 static int		ApplicationType(Tcl_Interp *interp,
 			    const char *fileName, char *fullName);
-static void		BuildCommandLine(const char *executable, Tcl_Size argc,
+static void		BuildCommandLine(const char *executable, size_t argc,
 			    const char **argv, Tcl_DString *linePtr);
 static BOOL		HasConsole(void);
 static int		PipeBlockModeProc(void *instanceData, int mode);
@@ -859,7 +859,7 @@ TclpCloseFile(
  *--------------------------------------------------------------------------
  */
 
-Tcl_Size
+size_t
 TclpGetPid(
     Tcl_Pid pid)		/* The HANDLE of the child process. */
 {
@@ -911,7 +911,7 @@ TclpCreateProcess(
 				 * occurred when creating the child process.
 				 * Error messages from the child process
 				 * itself are sent to errorFile. */
-    Tcl_Size argc,			/* Number of arguments in following array. */
+    size_t argc,			/* Number of arguments in following array. */
     const char **argv,		/* Array of argument strings. argv[0] contains
 				 * the name of the executable converted to
 				 * native format (using the
@@ -1536,14 +1536,14 @@ static void
 BuildCommandLine(
     const char *executable,	/* Full path of executable (including
 				 * extension). Replacement for argv[0]. */
-    Tcl_Size argc,			/* Number of arguments. */
+    size_t argc,			/* Number of arguments. */
     const char **argv,		/* Argument strings in UTF. */
     Tcl_DString *linePtr)	/* Initialized Tcl_DString that receives the
 				 * command line (WCHAR). */
 {
     const char *arg, *start, *special, *bspos;
     int quote = 0;
-    Tcl_Size i;
+    size_t i;
     Tcl_DString ds;
     static const char specMetaChars[] = "&|^<>!()%";
 				/* Characters to enclose in quotes if unpaired
@@ -1760,7 +1760,7 @@ TclpCreateCommandChannel(
     TclFile writeFile,		/* If non-null, gives the file for writing. */
     TclFile errorFile,		/* If non-null, gives the file where errors
 				 * can be read. */
-    Tcl_Size numPids,		/* The number of pids in the pid array. */
+    size_t numPids,		/* The number of pids in the pid array. */
     Tcl_Pid *pidPtr)		/* An array of process identifiers. */
 {
     char channelName[16 + TCL_INTEGER_SPACE];
@@ -1823,7 +1823,7 @@ TclpCreateCommandChannel(
      * unique, in case channels share handles (stdin/stdout).
      */
 
-    sprintf(channelName, "file%" TCL_Z_MODIFIER "x", (size_t) infoPtr);
+    snprintf(channelName, sizeof(channelName), "file%" TCL_Z_MODIFIER "x", (size_t) infoPtr);
     infoPtr->channel = Tcl_CreateChannel(&pipeChannelType, channelName,
 	    infoPtr, infoPtr->validMask);
 
@@ -1900,7 +1900,7 @@ TclGetAndDetachPids(
     PipeInfo *pipePtr;
     const Tcl_ChannelType *chanTypePtr;
     Tcl_Obj *pidsObj;
-    Tcl_Size i;
+    size_t i;
 
     /*
      * Punt if the channel is not a command channel.
@@ -2705,7 +2705,7 @@ TclWinAddProcess(
     void *hProcess,		/* Handle to process */
     size_t id)		/* Global process identifier */
 {
-    ProcInfo *procPtr = (ProcInfo*)Tcl_Alloc(sizeof(ProcInfo));
+    ProcInfo *procPtr = (ProcInfo *)Tcl_Alloc(sizeof(ProcInfo));
 
     PipeInit();
 
@@ -2744,7 +2744,7 @@ Tcl_PidObjCmd(
     Tcl_Channel chan;
     const Tcl_ChannelType *chanTypePtr;
     PipeInfo *pipePtr;
-    Tcl_Size i;
+    size_t i;
     Tcl_Obj *resultPtr;
 
     if (objc > 2) {
@@ -2805,7 +2805,7 @@ WaitForRead(
 				 * or not. */
 {
     DWORD timeout, count;
-    HANDLE *handle = (HANDLE *)((WinFile *) infoPtr->readFile)->handle;
+    HANDLE handle = ((WinFile *) infoPtr->readFile)->handle;
 
     while (1) {
 	/*
@@ -3191,7 +3191,7 @@ TclpOpenTemporaryFile(
     char *namePtr;
     HANDLE handle;
     DWORD flags = FILE_ATTRIBUTE_TEMPORARY;
-    Tcl_Size length;
+    size_t length;
     int counter, counter2;
     Tcl_DString buf;
 
@@ -3227,7 +3227,7 @@ TclpOpenTemporaryFile(
     do {
 	char number[TCL_INTEGER_SPACE + 4];
 
-	sprintf(number, "%d.TMP", counter);
+	snprintf(number, sizeof(number), "%d.TMP", counter);
 	counter = (unsigned short) (counter + 1);
 	Tcl_DStringInit(&buf);
 	Tcl_UtfToWCharDString(number, strlen(number), &buf);
diff --git a/win/tclWinReg.c b/win/tclWinReg.c
index f9481be..becc6f5 100644
--- a/win/tclWinReg.c
+++ b/win/tclWinReg.c
@@ -1508,7 +1508,7 @@ AppendSystemError(
 	    MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (WCHAR *) tMsgPtrPtr,
 	    0, NULL);
     if (length == 0) {
-	sprintf(msgBuf, "unknown error: %ld", error);
+	snprintf(msgBuf, sizeof(msgBuf), "unknown error: %ld", error);
 	msg = msgBuf;
     } else {
 	char *msgPtr;
@@ -1534,7 +1534,7 @@ AppendSystemError(
 	msg = msgPtr;
     }
 
-    sprintf(id, "%ld", error);
+    snprintf(id, sizeof(id), "%ld", error);
     Tcl_SetErrorCode(interp, "WINDOWS", id, msg, NULL);
     Tcl_AppendToObj(resultPtr, msg, length);
     Tcl_SetObjResult(interp, resultPtr);
diff --git a/win/tclWinSerial.c b/win/tclWinSerial.c
index 3db36d5..f4b1813 100644
--- a/win/tclWinSerial.c
+++ b/win/tclWinSerial.c
@@ -85,7 +85,7 @@ typedef struct SerialInfo {
     int readable;		/* Flag that the channel is readable. */
     int writable;		/* Flag that the channel is writable. */
     int blockTime;		/* Maximum blocktime in msec. */
-    unsigned int lastEventTime;	/* Time in milliseconds since last readable
+    unsigned long long lastEventTime;	/* Time in milliseconds since last readable
 				 * event. */
 				/* Next readable event only after blockTime */
     DWORD error;		/* pending error code returned by
@@ -165,30 +165,30 @@ static COMMTIMEOUTS no_timeout = {
  * Declarations for functions used only in this file.
  */
 
-static int		SerialBlockProc(ClientData instanceData, int mode);
-static void		SerialCheckProc(ClientData clientData, int flags);
-static int		SerialCloseProc(ClientData instanceData,
+static int		SerialBlockProc(void *instanceData, int mode);
+static void		SerialCheckProc(void *clientData, int flags);
+static int		SerialCloseProc(void *instanceData,
 			    Tcl_Interp *interp, int flags);
 static int		SerialEventProc(Tcl_Event *evPtr, int flags);
-static void		SerialExitHandler(ClientData clientData);
-static int		SerialGetHandleProc(ClientData instanceData,
-			    int direction, ClientData *handlePtr);
+static void		SerialExitHandler(void *clientData);
+static int		SerialGetHandleProc(void *instanceData,
+			    int direction, void **handlePtr);
 static ThreadSpecificData *SerialInit(void);
-static int		SerialInputProc(ClientData instanceData, char *buf,
+static int		SerialInputProc(void *instanceData, char *buf,
 			    int toRead, int *errorCode);
-static int		SerialOutputProc(ClientData instanceData,
+static int		SerialOutputProc(void *instanceData,
 			    const char *buf, int toWrite, int *errorCode);
-static void		SerialSetupProc(ClientData clientData, int flags);
-static void		SerialWatchProc(ClientData instanceData, int mask);
-static void		ProcExitHandler(ClientData clientData);
-static int		SerialGetOptionProc(ClientData instanceData,
+static void		SerialSetupProc(void *clientData, int flags);
+static void		SerialWatchProc(void *instanceData, int mask);
+static void		ProcExitHandler(void *clientData);
+static int		SerialGetOptionProc(void *instanceData,
 			    Tcl_Interp *interp, const char *optionName,
 			    Tcl_DString *dsPtr);
-static int		SerialSetOptionProc(ClientData instanceData,
+static int		SerialSetOptionProc(void *instanceData,
 			    Tcl_Interp *interp, const char *optionName,
 			    const char *value);
 static DWORD WINAPI	SerialWriterThread(LPVOID arg);
-static void		SerialThreadActionProc(ClientData instanceData,
+static void		SerialThreadActionProc(void *instanceData,
 			    int action);
 static int		SerialBlockingRead(SerialInfo *infoPtr, LPVOID buf,
 			    DWORD bufSize, LPDWORD lpRead, LPOVERLAPPED osPtr);
@@ -373,14 +373,14 @@ SerialBlockTime(
  *----------------------------------------------------------------------
  */
 
-static unsigned int
+static unsigned long long
 SerialGetMilliseconds(void)
 {
     Tcl_Time time;
 
     Tcl_GetTime(&time);
 
-    return (time.sec * 1000 + time.usec / 1000);
+    return ((unsigned long long)time.sec * 1000 + (unsigned long)time.usec / 1000);
 }
 
 /*
@@ -469,7 +469,7 @@ SerialCheckProc(
     int needEvent;
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
     COMSTAT cStat;
-    unsigned int time;
+    unsigned long long time;
 
     if (!(flags & TCL_FILE_EVENTS)) {
 	return;
@@ -519,8 +519,8 @@ SerialCheckProc(
 			    (infoPtr->error & SERIAL_READ_ERRORS)) {
 			infoPtr->readable = 1;
 			time = SerialGetMilliseconds();
-			if ((unsigned int) (time - infoPtr->lastEventTime)
-				>= (unsigned int) infoPtr->blockTime) {
+			if ((time - infoPtr->lastEventTime)
+				>= (unsigned long long) infoPtr->blockTime) {
 			    needEvent = 1;
 			    infoPtr->lastEventTime = time;
 			}
@@ -561,7 +561,7 @@ SerialCheckProc(
 
 static int
 SerialBlockProc(
-    ClientData instanceData,    /* Instance data for channel. */
+    void *instanceData,    /* Instance data for channel. */
     int mode)			/* TCL_MODE_BLOCKING or
 				 * TCL_MODE_NONBLOCKING. */
 {
@@ -600,7 +600,7 @@ SerialBlockProc(
 
 static int
 SerialCloseProc(
-    ClientData instanceData,    /* Pointer to SerialInfo structure. */
+    void *instanceData,    /* Pointer to SerialInfo structure. */
     TCL_UNUSED(Tcl_Interp *),
     int flags)
 {
@@ -796,7 +796,7 @@ SerialBlockingWrite(
     LeaveCriticalSection(&infoPtr->csWrite);
 
     if (result == FALSE) {
-	int err = GetLastError();
+	DWORD err = GetLastError();
 
 	switch (err) {
 	case ERROR_IO_PENDING:
@@ -855,7 +855,7 @@ SerialBlockingWrite(
 
 static int
 SerialInputProc(
-    ClientData instanceData,	/* Serial state. */
+    void *instanceData,	/* Serial state. */
     char *buf,			/* Where to store data read. */
     int bufSize,		/* How much space is available in the
 				 * buffer? */
@@ -918,7 +918,7 @@ SerialInputProc(
     }
 
     if (bufSize == 0) {
-	return bytesRead = 0;
+	return 0;
     }
 
     /*
@@ -962,7 +962,7 @@ SerialInputProc(
 
 static int
 SerialOutputProc(
-    ClientData instanceData,	/* Serial state. */
+    void *instanceData,	/* Serial state. */
     const char *buf,		/* The data buffer. */
     int toWrite,		/* How many bytes to write? */
     int *errorCode)		/* Where to store error code. */
@@ -1192,7 +1192,7 @@ SerialEventProc(
 
 static void
 SerialWatchProc(
-    ClientData instanceData,	/* Serial state. */
+    void *instanceData,	/* Serial state. */
     int mask)			/* What events to watch for, OR-ed combination
 				 * of TCL_READABLE, TCL_WRITABLE and
 				 * TCL_EXCEPTION. */
@@ -1249,13 +1249,13 @@ SerialWatchProc(
 
 static int
 SerialGetHandleProc(
-    ClientData instanceData,	/* The serial state. */
+    void *instanceData,	/* The serial state. */
     TCL_UNUSED(int) /*direction*/,
-    ClientData *handlePtr)	/* Where to store the handle. */
+    void **handlePtr)	/* Where to store the handle. */
 {
     SerialInfo *infoPtr = (SerialInfo *) instanceData;
 
-    *handlePtr = (ClientData) infoPtr->handle;
+    *handlePtr = (void *) infoPtr->handle;
     return TCL_OK;
 }
 
@@ -1476,7 +1476,7 @@ TclWinOpenSerialChannel(
      * are shared between multiple channels (stdin/stdout).
      */
 
-    sprintf(channelName, "file%" TCL_Z_MODIFIER "x", (size_t) infoPtr);
+    snprintf(channelName, 16 + TCL_INTEGER_SPACE, "file%" TCL_Z_MODIFIER "x", (size_t) infoPtr);
 
     infoPtr->channel = Tcl_CreateChannel(&serialChannelType, channelName,
 	    infoPtr, permissions);
@@ -1558,7 +1558,7 @@ SerialErrorStr(
     if (error & ~((DWORD) (SERIAL_READ_ERRORS | SERIAL_WRITE_ERRORS))) {
 	char buf[TCL_INTEGER_SPACE + 1];
 
-	wsprintfA(buf, "%d", error);
+	snprintf(buf, sizeof(buf), "%ld", error);
 	Tcl_DStringAppendElement(dsPtr, buf);
     }
 }
@@ -1613,7 +1613,7 @@ SerialModemStatusStr(
 
 static int
 SerialSetOptionProc(
-    ClientData instanceData,	/* File state. */
+    void *instanceData,	/* File state. */
     Tcl_Interp *interp,		/* For error reporting - can be NULL. */
     const char *optionName,	/* Which option to set? */
     const char *value)		/* New value for option. */
@@ -2037,7 +2037,7 @@ SerialSetOptionProc(
 
 static int
 SerialGetOptionProc(
-    ClientData instanceData,	/* File state. */
+    void *instanceData,	/* File state. */
     Tcl_Interp *interp,		/* For error reporting - can be NULL. */
     const char *optionName,	/* Option to get. */
     Tcl_DString *dsPtr)		/* Where to store value(s). */
@@ -2105,7 +2105,7 @@ SerialGetOptionProc(
 	stop = (dcb.StopBits == ONESTOPBIT) ? "1" :
 		(dcb.StopBits == ONE5STOPBITS) ? "1.5" : "2";
 
-	wsprintfA(buf, "%d,%c,%d,%s", dcb.BaudRate, parity,
+	snprintf(buf, sizeof(buf), "%ld,%c,%d,%s", dcb.BaudRate, parity,
 		dcb.ByteSize, stop);
 	Tcl_DStringAppendElement(dsPtr, buf);
     }
@@ -2121,7 +2121,7 @@ SerialGetOptionProc(
 	char buf[TCL_INTEGER_SPACE + 1];
 
 	valid = 1;
-	wsprintfA(buf, "%d", infoPtr->blockTime);
+	snprintf(buf, sizeof(buf), "%d", infoPtr->blockTime);
 	Tcl_DStringAppendElement(dsPtr, buf);
     }
 
@@ -2137,9 +2137,9 @@ SerialGetOptionProc(
 	char buf[TCL_INTEGER_SPACE + 1];
 	valid = 1;
 
-	wsprintfA(buf, "%d", infoPtr->sysBufRead);
+	snprintf(buf, sizeof(buf), "%ld", infoPtr->sysBufRead);
 	Tcl_DStringAppendElement(dsPtr, buf);
-	wsprintfA(buf, "%d", infoPtr->sysBufWrite);
+	snprintf(buf, sizeof(buf), "%ld", infoPtr->sysBufWrite);
 	Tcl_DStringAppendElement(dsPtr, buf);
     }
     if (len == 0) {
@@ -2220,9 +2220,9 @@ SerialGetOptionProc(
 	count = (int) cStat.cbOutQue + infoPtr->writeQueue;
 	LeaveCriticalSection(&infoPtr->csWrite);
 
-	wsprintfA(buf, "%d", inBuffered + cStat.cbInQue);
+	snprintf(buf, sizeof(buf), "%ld", inBuffered + cStat.cbInQue);
 	Tcl_DStringAppendElement(dsPtr, buf);
-	wsprintfA(buf, "%d", outBuffered + count);
+	snprintf(buf, sizeof(buf), "%d", outBuffered + count);
 	Tcl_DStringAppendElement(dsPtr, buf);
     }
 
@@ -2274,7 +2274,7 @@ SerialGetOptionProc(
 
 static void
 SerialThreadActionProc(
-    ClientData instanceData,
+    void *instanceData,
     int action)
 {
     SerialInfo *infoPtr = (SerialInfo *) instanceData;
diff --git a/win/tclWinSock.c b/win/tclWinSock.c
index e5c7ee3..af871bc 100644
--- a/win/tclWinSock.c
+++ b/win/tclWinSock.c
@@ -373,8 +373,8 @@ InitializeHostName(
 	Tcl_DStringSetLength(&inDs, 256);
 	if (gethostname(Tcl_DStringValue(&inDs),
 		Tcl_DStringLength(&inDs)) == 0) {
-	    Tcl_ExternalToUtfDStringEx(NULL, Tcl_DStringValue(&inDs),
-		    TCL_INDEX_NONE, TCL_ENCODING_NOCOMPLAIN, &ds);
+	    Tcl_ExternalToUtfDStringEx(NULL, NULL, Tcl_DStringValue(&inDs),
+		    TCL_INDEX_NONE, TCL_ENCODING_PROFILE_TCL8, &ds, NULL);
 	}
 	Tcl_DStringFree(&inDs);
     }
@@ -1977,7 +1977,7 @@ Tcl_OpenTcpClient(
 	return NULL;
     }
 
-    sprintf(channelName, SOCK_TEMPLATE, statePtr);
+    snprintf(channelName, sizeof(channelName), SOCK_TEMPLATE, statePtr);
 
     statePtr->channel = Tcl_CreateChannel(&tcpChannelType, channelName,
 	    statePtr, (TCL_READABLE | TCL_WRITABLE));
@@ -2036,7 +2036,7 @@ Tcl_MakeTcpClientChannel(
     statePtr->selectEvents = FD_READ | FD_CLOSE | FD_WRITE;
     SendSelectMessage(tsdPtr, SELECT, statePtr);
 
-    sprintf(channelName, SOCK_TEMPLATE, statePtr);
+    snprintf(channelName, sizeof(channelName), SOCK_TEMPLATE, statePtr);
     statePtr->channel = Tcl_CreateChannel(&tcpChannelType, channelName,
 	    statePtr, (TCL_READABLE | TCL_WRITABLE));
     Tcl_SetChannelOption(NULL, statePtr->channel, "-translation", "auto crlf");
@@ -2208,7 +2208,7 @@ Tcl_OpenTcpServerEx(
 
 	statePtr->acceptProc = acceptProc;
 	statePtr->acceptProcData = acceptProcData;
-	sprintf(channelName, SOCK_TEMPLATE, statePtr);
+	snprintf(channelName, sizeof(channelName), SOCK_TEMPLATE, statePtr);
 	statePtr->channel = Tcl_CreateChannel(&tcpChannelType, channelName,
 		statePtr, 0);
 	/*
@@ -2293,7 +2293,7 @@ TcpAccept(
     newInfoPtr->selectEvents = (FD_READ | FD_WRITE | FD_CLOSE);
     SendSelectMessage(tsdPtr, SELECT, newInfoPtr);
 
-    sprintf(channelName, SOCK_TEMPLATE, newInfoPtr);
+    snprintf(channelName, sizeof(channelName), SOCK_TEMPLATE, newInfoPtr);
     newInfoPtr->channel = Tcl_CreateChannel(&tcpChannelType, channelName,
 	    newInfoPtr, (TCL_READABLE | TCL_WRITABLE));
     if (Tcl_SetChannelOption(NULL, newInfoPtr->channel, "-translation",
diff --git a/win/tclWinTest.c b/win/tclWinTest.c
index c012b53..29bdfe4 100644
--- a/win/tclWinTest.c
+++ b/win/tclWinTest.c
@@ -22,9 +22,8 @@
 /*
  * For TestplatformChmod on Windows
  */
-#ifdef _WIN32
 #include <aclapi.h>
-#endif
+#include <sddl.h>
 
 /*
  * MinGW 3.4.2 does not define this.
@@ -390,176 +389,189 @@ TestExceptionCmd(
     return TCL_OK;
 }
 
+/*
+ * This "chmod" works sufficiently for test script purposes. Do not expect
+ * it to be exact emulation of Unix chmod (not sure if that's even possible)
+ */
 static int
 TestplatformChmod(
     const char *nativePath,
     int pmode)
 {
-    static const SECURITY_INFORMATION infoBits = OWNER_SECURITY_INFORMATION
-	    | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION;
-    /* don't reset change permissions mask (WRITE_DAC, allow test-cases restore it to cleanup) */
-    static const DWORD readOnlyMask = FILE_DELETE_CHILD | FILE_ADD_FILE
-	    | FILE_ADD_SUBDIRECTORY | FILE_WRITE_EA | FILE_APPEND_DATA
-	    | FILE_WRITE_DATA
-	    | DELETE;
-
     /*
-     * References to security functions (only available on NT and later).
+     * Note FILE_DELETE_CHILD missing from dirWriteMask because we do
+     * not want overriding of child's delete setting when testing
      */
-
-    const BOOL set_readOnly = !(pmode & 0222);
-    BOOL acl_readOnly_found = FALSE, curAclPresent, curAclDefaulted;
-    SID_IDENTIFIER_AUTHORITY userSidAuthority = {
-	SECURITY_WORLD_SID_AUTHORITY
-    };
-    BYTE *secDesc = 0;
-    DWORD secDescLen, attr, newAclSize;
-    ACL_SIZE_INFORMATION ACLSize;
-    PACL curAcl, newAcl = 0;
-    WORD j;
-    SID *userSid = 0;
-    char *userDomain = 0;
+    static const DWORD dirWriteMask =
+	FILE_WRITE_ATTRIBUTES | FILE_WRITE_EA |
+	FILE_ADD_FILE | FILE_ADD_SUBDIRECTORY | STANDARD_RIGHTS_WRITE | DELETE |
+	SYNCHRONIZE;
+    static const DWORD dirReadMask =
+	FILE_READ_ATTRIBUTES | FILE_READ_EA | FILE_LIST_DIRECTORY |
+	STANDARD_RIGHTS_READ | SYNCHRONIZE;
+    /* Note - default user privileges allow ignoring TRAVERSE setting */
+    static const DWORD dirExecuteMask =
+	FILE_TRAVERSE | STANDARD_RIGHTS_READ | SYNCHRONIZE;
+
+    static const DWORD fileWriteMask =
+	FILE_WRITE_ATTRIBUTES | FILE_WRITE_EA | FILE_WRITE_DATA |
+	FILE_APPEND_DATA | STANDARD_RIGHTS_WRITE | DELETE | SYNCHRONIZE;
+    static const DWORD fileReadMask =
+	FILE_READ_ATTRIBUTES | FILE_READ_EA | FILE_READ_DATA |
+	STANDARD_RIGHTS_READ | SYNCHRONIZE;
+    static const DWORD fileExecuteMask =
+	FILE_EXECUTE | STANDARD_RIGHTS_READ | SYNCHRONIZE;
+
+    DWORD attr, newAclSize;
+    PACL newAcl = NULL;
     int res = 0;
 
-    /*
-     * Process the chmod request.
-     */
+    HANDLE hToken = NULL;
+    int i;
+    int nSids = 0;
+    struct {
+	PSID pSid;
+	DWORD mask;
+	DWORD sidLen;
+    } aceEntry[3];
+    DWORD dw;
+    int isDir;
+    TOKEN_USER *pTokenUser = NULL;
 
-    attr = GetFileAttributesA(nativePath);
-
-    /*
-     * nativePath not found
-     */
+    res = -1; /* Assume failure */
 
+    attr = GetFileAttributesA(nativePath);
     if (attr == 0xFFFFFFFF) {
-	res = -1;
-	goto done;
+	goto done; /* Not found */
     }
 
-    /*
-     * If nativePath is not a directory, there is no special handling.
-     */
+    isDir = (attr & FILE_ATTRIBUTE_DIRECTORY) != 0;
 
-    if (!(attr & FILE_ATTRIBUTE_DIRECTORY)) {
+    if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hToken)) {
 	goto done;
     }
 
-    /*
-     * Set the result to error, if the ACL change is successful it will be
-     * reset to 0.
-     */
-
-    res = -1;
-
-    /*
-     * Read the security descriptor for the directory. Note the first call
-     * obtains the size of the security descriptor.
-     */
-
-    if (!GetFileSecurityA(nativePath, infoBits, NULL, 0, &secDescLen)) {
-	DWORD secDescLen2 = 0;
-
-	if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) {
-	    goto done;
-	}
-
-	secDesc = (BYTE *)Tcl_Alloc(secDescLen);
-	if (!GetFileSecurityA(nativePath, infoBits,
-		(PSECURITY_DESCRIPTOR) secDesc, secDescLen, &secDescLen2)
-		|| (secDescLen < secDescLen2)) {
-	    goto done;
-	}
-    }
-
-    /*
-     * Get the World SID.
-     */
-
-    userSid = (SID *)Tcl_Alloc(GetSidLengthRequired((UCHAR) 1));
-    InitializeSid(userSid, &userSidAuthority, (BYTE) 1);
-    *(GetSidSubAuthority(userSid, 0)) = SECURITY_WORLD_RID;
-
-    /*
-     * If curAclPresent == false then curAcl and curAclDefaulted not valid.
-     */
-
-    if (!GetSecurityDescriptorDacl((PSECURITY_DESCRIPTOR) secDesc,
-	    &curAclPresent, &curAcl, &curAclDefaulted)) {
+    /* Get process SID */
+    if (!GetTokenInformation(hToken, TokenUser, NULL, 0, &dw) &&
+	GetLastError() != ERROR_INSUFFICIENT_BUFFER) {
 	goto done;
     }
-    if (!curAclPresent || !curAcl) {
-	ACLSize.AclBytesInUse = 0;
-	ACLSize.AceCount = 0;
-    } else if (!GetAclInformation(curAcl, &ACLSize, sizeof(ACLSize),
-	    AclSizeInformation)) {
+    pTokenUser = (TOKEN_USER *)Tcl_Alloc(dw);
+    if (!GetTokenInformation(hToken, TokenUser, pTokenUser, dw, &dw)) {
 	goto done;
     }
-
-    /*
-     * Allocate memory for the new ACL.
-     */
-
-    newAclSize = ACLSize.AclBytesInUse + sizeof(ACCESS_DENIED_ACE)
-	    + GetLengthSid(userSid) - sizeof(DWORD);
-    newAcl = (PACL) Tcl_Alloc(newAclSize);
-
-    /*
-     * Initialize the new ACL.
-     */
-
-    if (!InitializeAcl(newAcl, newAclSize, ACL_REVISION)) {
+    aceEntry[nSids].sidLen = GetLengthSid(pTokenUser->User.Sid);
+    aceEntry[nSids].pSid = Tcl_Alloc(aceEntry[nSids].sidLen);
+    if (!CopySid(aceEntry[nSids].sidLen,
+		 aceEntry[nSids].pSid,
+		 pTokenUser->User.Sid)) {
+	Tcl_Free(aceEntry[nSids].pSid); /* Since we have not ++'ed nSids */
 	goto done;
     }
-
     /*
-     * Add denied to make readonly, this will be known as a "read-only tag".
+     * Always include DACL modify rights so we don't get locked out
      */
-
-    if (set_readOnly && !AddAccessDeniedAce(newAcl, ACL_REVISION,
-	    readOnlyMask, userSid)) {
-	goto done;
+    aceEntry[nSids].mask = READ_CONTROL | WRITE_DAC | WRITE_OWNER | SYNCHRONIZE |
+			   FILE_READ_ATTRIBUTES | FILE_WRITE_ATTRIBUTES;
+    if (pmode & 0700) {
+	/* Owner permissions. Assumes current process is owner */
+	if (pmode & 0400) {
+	    aceEntry[nSids].mask |= isDir ? dirReadMask : fileReadMask;
+	}
+	if (pmode & 0200) {
+	    aceEntry[nSids].mask |= isDir ? dirWriteMask : fileWriteMask;
+	}
+	if (pmode & 0100) {
+	    aceEntry[nSids].mask |= isDir ? dirExecuteMask : fileExecuteMask;
+	}
     }
+    ++nSids;
 
-    acl_readOnly_found = FALSE;
-    for (j = 0; j < ACLSize.AceCount; j++) {
-	LPVOID pACE2;
-	ACE_HEADER *phACE2;
+    if (pmode & 0070) {
+	/* Group permissions. */
 
-	if (!GetAce(curAcl, j, &pACE2)) {
+	TOKEN_PRIMARY_GROUP *pTokenGroup;
+
+	/* Get primary group SID */
+	if (!GetTokenInformation(
+		hToken, TokenPrimaryGroup, NULL, 0, &dw) &&
+		GetLastError() != ERROR_INSUFFICIENT_BUFFER) {
 	    goto done;
 	}
+	pTokenGroup = (TOKEN_PRIMARY_GROUP *)Tcl_Alloc(dw);
+	if (!GetTokenInformation(hToken, TokenPrimaryGroup, pTokenGroup, dw, &dw)) {
+	    Tcl_Free(pTokenGroup);
+	    goto done;
+	}
+	aceEntry[nSids].sidLen = GetLengthSid(pTokenGroup->PrimaryGroup);
+	aceEntry[nSids].pSid = Tcl_Alloc(aceEntry[nSids].sidLen);
+	if (!CopySid(aceEntry[nSids].sidLen, aceEntry[nSids].pSid, pTokenGroup->PrimaryGroup)) {
+	    Tcl_Free(pTokenGroup);
+	    Tcl_Free(aceEntry[nSids].pSid); /* Since we have not ++'ed nSids */
+	    goto done;
+	}
+	Tcl_Free(pTokenGroup);
 
-	phACE2 = (ACE_HEADER *) pACE2;
-
-	/*
-	 * Do NOT propagate inherited ACEs.
-	 */
+	/* Generate mask for group ACL */
 
-	if (phACE2->AceFlags & INHERITED_ACE) {
-	    continue;
+	aceEntry[nSids].mask = 0;
+	if (pmode & 0040) {
+	    aceEntry[nSids].mask |= isDir ? dirReadMask : fileReadMask;
 	}
+	if (pmode & 0020) {
+	    aceEntry[nSids].mask |= isDir ? dirWriteMask : fileWriteMask;
+	}
+	if (pmode & 0010) {
+	    aceEntry[nSids].mask |= isDir ? dirExecuteMask : fileExecuteMask;
+	}
+	++nSids;
+    }
 
-	/*
-	 * Skip the "read-only tag" restriction (either added above, or it is
-	 * being removed).
-	 */
+    if (pmode & 0007) {
+	/* World permissions */
+	PSID pWorldSid;
+	if (!ConvertStringSidToSidA("S-1-1-0", &pWorldSid)) {
+	    goto done;
+	}
+	aceEntry[nSids].sidLen = GetLengthSid(pWorldSid);
+	aceEntry[nSids].pSid = Tcl_Alloc(aceEntry[nSids].sidLen);
+	if (!CopySid(aceEntry[nSids].sidLen, aceEntry[nSids].pSid, pWorldSid)) {
+	    LocalFree(pWorldSid);
+	    Tcl_Free(aceEntry[nSids].pSid); /* Since we have not ++'ed nSids */
+	    goto done;
+	}
+	LocalFree(pWorldSid);
 
-	if (phACE2->AceType == ACCESS_DENIED_ACE_TYPE) {
-	    ACCESS_DENIED_ACE *pACEd = (ACCESS_DENIED_ACE *) phACE2;
+	/* Generate mask for world ACL */
 
-	    if (pACEd->Mask == readOnlyMask
-		    && EqualSid(userSid, (PSID) &pACEd->SidStart)) {
-		acl_readOnly_found = TRUE;
-		continue;
-	    }
+	aceEntry[nSids].mask = 0;
+	if (pmode & 0004) {
+	    aceEntry[nSids].mask |= isDir ? dirReadMask : fileReadMask;
+	}
+	if (pmode & 0002) {
+	    aceEntry[nSids].mask |= isDir ? dirWriteMask : fileWriteMask;
 	}
+	if (pmode & 0001) {
+	    aceEntry[nSids].mask |= isDir ? dirExecuteMask : fileExecuteMask;
+	}
+	++nSids;
+    }
 
-	/*
-	 * Copy the current ACE from the old to the new ACL.
-	 */
+    /* Allocate memory and initialize the new ACL. */
+
+    newAclSize = sizeof(ACL);
+    /* Add in size required for each ACE entry in the ACL */
+    for (i = 0; i < nSids; ++i) {
+	newAclSize +=
+	    offsetof(ACCESS_ALLOWED_ACE, SidStart) + aceEntry[i].sidLen;
+    }
+    newAcl = (PACL)Tcl_Alloc(newAclSize);
+    if (!InitializeAcl(newAcl, newAclSize, ACL_REVISION)) {
+	goto done;
+    }
 
-	if (!AddAce(newAcl, ACL_REVISION, MAXDWORD, (PACL *) pACE2,
-		((PACE_HEADER) pACE2)->AceSize)) {
+    for (i = 0; i < nSids; ++i) {
+	if (!AddAccessAllowedAce(newAcl, ACL_REVISION, aceEntry[i].mask, aceEntry[i].pSid)) {
 	    goto done;
 	}
     }
@@ -569,36 +581,39 @@ TestplatformChmod(
      * to remove inherited ACL (we need to overwrite the default ACL's in this case)
      */
 
-    if (set_readOnly == acl_readOnly_found || SetNamedSecurityInfoA(
-	    (LPSTR) nativePath, SE_FILE_OBJECT,
-	    DACL_SECURITY_INFORMATION /*| PROTECTED_DACL_SECURITY_INFORMATION*/,
-	    NULL, NULL, newAcl, NULL) == ERROR_SUCCESS) {
+    if (SetNamedSecurityInfoA((LPSTR)nativePath,
+			      SE_FILE_OBJECT,
+			      DACL_SECURITY_INFORMATION |
+				  PROTECTED_DACL_SECURITY_INFORMATION,
+			      NULL,
+			      NULL,
+			      newAcl,
+			      NULL) == ERROR_SUCCESS) {
 	res = 0;
     }
 
   done:
-    if (secDesc) {
-	Tcl_Free(secDesc);
+    if (pTokenUser) {
+	Tcl_Free(pTokenUser);
+    }
+    if (hToken) {
+	CloseHandle(hToken);
     }
     if (newAcl) {
 	Tcl_Free(newAcl);
     }
-    if (userSid) {
-	Tcl_Free(userSid);
-    }
-    if (userDomain) {
-	Tcl_Free(userDomain);
+    for (i = 0; i < nSids; ++i) {
+	Tcl_Free(aceEntry[i].pSid);
     }
 
     if (res != 0) {
 	return res;
     }
 
-    /*
-     * Run normal chmod command.
-     */
-
+    /* Run normal chmod command */
     return chmod(nativePath, pmode);
+
+
 }
 
 /*
diff --git a/win/tclWinThrd.c b/win/tclWinThrd.c
index 841a854..0195895 100644
--- a/win/tclWinThrd.c
+++ b/win/tclWinThrd.c
@@ -203,7 +203,7 @@ int
 TclpThreadCreate(
     Tcl_ThreadId *idPtr,	/* Return, the ID of the thread. */
     Tcl_ThreadCreateProc *proc,	/* Main() function of the thread. */
-    ClientData clientData,	/* The one argument to Main(). */
+    void *clientData,	/* The one argument to Main(). */
     size_t stackSize,		/* Size of stack for the new thread. */
     int flags)			/* Flags controlling behaviour of the new
 				 * thread. */
@@ -535,7 +535,7 @@ TclFinalizeLock(void)
 #if TCL_THREADS
 
 /* locally used prototype */
-static void		FinalizeConditionEvent(ClientData data);
+static void		FinalizeConditionEvent(void *data);
 
 /*
  *----------------------------------------------------------------------
@@ -725,7 +725,7 @@ Tcl_ConditionWait(
     if (timePtr == NULL) {
 	wtime = INFINITE;
     } else {
-	wtime = timePtr->sec * 1000 + timePtr->usec / 1000;
+	wtime = (DWORD)timePtr->sec * 1000 + (unsigned long)timePtr->usec / 1000;
     }
 
     /*
@@ -880,7 +880,7 @@ Tcl_ConditionNotify(
 
 static void
 FinalizeConditionEvent(
-    ClientData data)
+    void *data)
 {
     ThreadSpecificData *tsdPtr = (ThreadSpecificData *) data;