summaryrefslogtreecommitdiffstats
path: root/win/tkWinFont.c
diff options
context:
space:
mode:
authorhobbs <hobbs>2000-02-08 10:01:16 (GMT)
committerhobbs <hobbs>2000-02-08 10:01:16 (GMT)
commit4a0d1284957db786ed4b02c4a426b3681212565f (patch)
tree02b8d0433d01163c90ddffa71adb18ffea17eb1c /win/tkWinFont.c
parentfa8fc8941bbf70bd8b1b429d46a832b29bd3c411 (diff)
downloadtk-4a0d1284957db786ed4b02c4a426b3681212565f.zip
tk-4a0d1284957db786ed4b02c4a426b3681212565f.tar.gz
tk-4a0d1284957db786ed4b02c4a426b3681212565f.tar.bz2
* win/tkWinFont.c: corrected symbol font use to only work on 8-bit
characters [Bug: 2406] * README: * unix/configure.in: * win/configure.in: * generic/tk.h (TK_RELEASE_SERIAL): Moved to 8.3.0 patchlevel
Diffstat (limited to 'win/tkWinFont.c')
-rw-r--r--win/tkWinFont.c10
1 files changed, 6 insertions, 4 deletions
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;
}
}