diff options
| -rw-r--r-- | win/configure.in | 4 | ||||
| -rw-r--r-- | win/tkWinFont.c | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/win/configure.in b/win/configure.in index c3fa297..02aec2d 100644 --- a/win/configure.in +++ b/win/configure.in @@ -2,14 +2,14 @@ # generate the file "configure", which is run during Tk installation # to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.14 2000/01/14 03:25:59 hobbs Exp $ +# RCS: @(#) $Id: configure.in,v 1.15 2000/02/08 10:01:16 hobbs Exp $ AC_INIT(../generic/tk.h) TK_VERSION=8.3 TK_MAJOR_VERSION=8 TK_MINOR_VERSION=3 -TK_PATCH_LEVEL="b2" +TK_PATCH_LEVEL=".0" VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION #-------------------------------------------------------------------- diff --git a/win/tkWinFont.c b/win/tkWinFont.c index b00be43..6d13d05 100644 --- a/win/tkWinFont.c +++ b/win/tkWinFont.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWinFont.c,v 1.7 2000/02/01 11:41:44 hobbs Exp $ + * RCS: @(#) $Id: tkWinFont.c,v 1.8 2000/02/08 10:01:16 hobbs Exp $ */ #include "tkWinInt.h" @@ -2299,13 +2299,15 @@ LoadFontRanges( * metrics are reported as F020 to F0FE. When we load * a symbol font, we must fix the character existence * metrics. + * + * Symbol fonts should only use the symbol encoding + * for 8-bit characters [note Bug: 2406] */ for (i = 0; i < segCount; i++) { - if ((startCount[i] & 0xff00) == 0xf000) { + if (((startCount[i] & 0xff00) == 0xf000) + && ((endCount[i] & 0xff00) == 0xf000)) { startCount[i] &= 0xff; - } - if ((endCount[i] & 0xff00) == 0xf000) { endCount[i] &= 0xff; } } |