changeset 17877:7841036d55f4

(x_load_font): Set 4 instead of -1 in fontp->encoding[1] for the meaning of `can't decided'.
author Kenichi Handa <handa@m17n.org>
date Mon, 19 May 1997 03:33:50 +0000
parents 6e27f660a0be
children 2232640df372
files src/xterm.c
diffstat 1 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/xterm.c	Mon May 19 03:21:06 1997 +0000
+++ b/src/xterm.c	Mon May 19 03:33:50 1997 +0000
@@ -6491,18 +6491,18 @@
 
     /* The slot `encoding' specifies how to map a character
        code-points (0x20..0x7F or 0x2020..0x7F7F) of each charset to
-       the font code-points (0x20..0x7F, 0xA0..0xFF, 0x2020..0x7F7F,
-       0xA0A0..0xFFFF, 0x20A0..0x7FFF, or 0xA020..0xFF7F).  For the
+       the font code-points (0:0x20..0x7F, 1:0xA0..0xFF, 0:0x2020..0x7F7F,
+       1:0xA0A0..0xFFFF, 3:0x20A0..0x7FFF, or 2:0xA020..0xFF7F).  For the
        moment, we don't know which charset uses this font.  So, we set
        informatoin in fontp->encoding[1] which is never used by any
-       charset.  If mapping can't be decided, set -1.  */
+       charset.  If mapping can't be decided, set 4.  */
     fontp->encoding[1]
       = (font->max_byte1 == 0
 	 /* 1-byte font */
 	 ? (font->min_char_or_byte2 < 0x80
 	    ? (font->max_char_or_byte2 < 0x80
 	       ? 0		/* 0x20..0x7F */
-	       : -1)		/* 0x20..0xFF (can't decide) */
+	       : 4)		/* 0x20..0xFF (can't decide) */
 	    : 1)		/* 0xA0..0xFF */
 	 /* 2-byte font */
 	 : (font->min_byte1 < 0x80
@@ -6510,13 +6510,13 @@
 	       ? (font->min_char_or_byte2 < 0x80
 		  ? (font->max_char_or_byte2 < 0x80
 		     ? 0		/* 0x2020..0x7F7F */
-		     : -1)	/* 0x2020..0x7FFF (can't decide) */
+		     : 4)	/* 0x2020..0x7FFF (can't decide) */
 		  : 3)		/* 0x20A0..0x7FFF */
-	       : -1)		/* 0x20??..0xA0?? (can't decide) */
+	       : 4)		/* 0x20??..0xA0?? (can't decide) */
 	    : (font->min_char_or_byte2 < 0x80
 	       ? (font->max_char_or_byte2 < 0x80
 		  ? 2		/* 0xA020..0xFF7F */
-		  : -1)		/* 0xA020..0xFFFF (can't decide) */
+		  : 4)		/* 0xA020..0xFFFF (can't decide) */
 	       : 1)));		/* 0xA0A0..0xFFFF */
 
     fontp->baseline_offset