diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-01-22 23:35:38 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-01-22 23:35:38 (GMT) |
| commit | c5f7f66cebff43a88665d40e6bc51504ed09831d (patch) | |
| tree | d8417ae8e2efef9361aea638003a10186426af33 /doc | |
| parent | 2b516939bd2d4aae1f1b2b8c561419146d99c978 (diff) | |
| parent | b31d88647917b263f24740bbceb02476d418a9fb (diff) | |
| download | tcl-c5f7f66cebff43a88665d40e6bc51504ed09831d.zip tcl-c5f7f66cebff43a88665d40e6bc51504ed09831d.tar.gz tcl-c5f7f66cebff43a88665d40e6bc51504ed09831d.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/encoding.n | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/doc/encoding.n b/doc/encoding.n index f345bed..d211f02 100644 --- a/doc/encoding.n +++ b/doc/encoding.n @@ -28,7 +28,8 @@ formats. Performs one of several encoding related operations, depending on \fIoption\fR. The legal \fIoption\fRs are: .TP -\fBencoding convertfrom\fR ?\fB-nocomplain\fR|\fB-strict\fR|\fB-failindex var\fR? ?\fIencoding\fR? \fIdata\fR +\fBencoding convertfrom\fR ?\fB-strict\fR? ?\fB-failindex var\fR? ?\fIencoding\fR? \fIdata\fR +\fBencoding convertfrom\fR \fB-nocomplain\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 @@ -50,15 +51,17 @@ 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 or \fB-strict\fR. +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). +otherwise - are just passed through). This option may not be used together +with \fB-nocomplain\fR. .VE "TCL8.7 TIP346, TIP607, TIP601" .RE .TP -\fBencoding convertto\fR ?\fB-nocomplain\fR|\fB-strict\fR|\fB-failindex var\fR? ?\fIencoding\fR? \fIstring\fR +\fBencoding convertto\fR ?\fB-strict\fR? ?\fB-failindex var\fR? ?\fIencoding\fR? \fIdata\fR +\fBencoding convertto\fR \fB-nocomplain\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 @@ -82,10 +85,10 @@ in case of a conversion error, the position of the input character causing the e 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 or \fB-strict\fR. +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. +encoder, it has no effect. This option may not be used together with \fB-nocomplain\fR. .VE "TCL8.7 TIP346, TIP607, TIP601" .RE .TP |