diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-12-04 15:12:19 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-12-04 15:12:19 (GMT) |
| commit | 6443a1db3be2198d76bc754d9a0f5a9c08683342 (patch) | |
| tree | b24ba1d27f6f2ff0048046b18e73defec6854a56 /generic/tclUtf.c | |
| parent | bf23a021385451ff52770191acec3f55d5c8575a (diff) | |
| parent | cb5c9f4f89b6e7242ba07f84e278d35f202d7edd (diff) | |
| download | tcl-6443a1db3be2198d76bc754d9a0f5a9c08683342.zip tcl-6443a1db3be2198d76bc754d9a0f5a9c08683342.tar.gz tcl-6443a1db3be2198d76bc754d9a0f5a9c08683342.tar.bz2 | |
Merge 9.0
Diffstat (limited to 'generic/tclUtf.c')
| -rw-r--r-- | generic/tclUtf.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/generic/tclUtf.c b/generic/tclUtf.c index ae87e1b..04a47c8 100644 --- a/generic/tclUtf.c +++ b/generic/tclUtf.c @@ -2636,12 +2636,25 @@ TclUniCharToUCS4( * by the Tcl_UniChar string. */ { if (((src[0] & 0xFC00) == 0xD800) && ((src[1] & 0xFC00) == 0xDC00)) { - *ucs4Ptr = (((src[0] & 0x3FF) << 10) | (src[01] & 0x3FF)) + 0x10000; + *ucs4Ptr = (((src[0] & 0x3FF) << 10) | (src[1] & 0x3FF)) + 0x10000; return 2; } *ucs4Ptr = src[0]; return 1; } + +const Tcl_UniChar *TclUCS4Prev(const Tcl_UniChar *src, const Tcl_UniChar *ptr) { + if (src <= ptr + 1) { + return ptr; + } + if (((src[-1] & 0xFC00) == 0xDC00) && ((src[-2] & 0xFC00) == 0xD800)) { + return src - 2; + } + return src - 1; +} + + + #endif /* |