summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2022-03-18 11:08:10 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2022-03-18 11:08:10 (GMT)
commita17e74a7eb7415b1e53f2f080272cc2186868fc3 (patch)
tree10b8de337d31d77c359086d06b745afa66578ee1 /doc
parent88a6952fc5f5a2a14afa15b21d6a7492a23ba2ea (diff)
parent20cc8e0bc110e2370ccc8de16637734127d5fcba (diff)
downloadtcl-a17e74a7eb7415b1e53f2f080272cc2186868fc3.zip
tcl-a17e74a7eb7415b1e53f2f080272cc2186868fc3.tar.gz
tcl-a17e74a7eb7415b1e53f2f080272cc2186868fc3.tar.bz2
Merge 9.0
Diffstat (limited to 'doc')
-rw-r--r--doc/Encoding.316
1 files changed, 8 insertions, 8 deletions
diff --git a/doc/Encoding.3 b/doc/Encoding.3
index 663cd3f..d95ca89 100644
--- a/doc/Encoding.3
+++ b/doc/Encoding.3
@@ -99,13 +99,13 @@ 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_STOPONERROR\fR signifies that the conversion routine should
-return immediately upon reading a source character that does not exist in
-the target encoding; otherwise a default fallback character will
-automatically be substituted. The flag \fBTCL_ENCODING_NOCOMPLAIN\fR has
-no effect, it is reserved for Tcl 9.0. 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.
+\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_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.
.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
@@ -236,7 +236,7 @@ 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_STOPONERROR\fR was specified.
+the target encoding and \fBTCL_ENCODING_NOCOMPLAIN\fR was not specified.
.RE
.LP
\fBTcl_UtfToExternalDString\fR converts a source buffer \fIsrc\fR from UTF-8