# HG changeset patch
# User Andrew Choi <akochoi@shaw.ca>
# Date 1025748645 0
# Node ID 56be68853618748c10cb72f44d215d5b110ea150
# Parent  a3ecd7edc3829221cb5f875554cedfcfbb7099a0
2002-07-03  Andrew Choi  <akochoi@shaw.ca>

        * macterm.c (init_font_name_table): Also add entry for
        jisx0201.1976-0 coding for Japanese font.
        (XLoadQueryFont): Use it.

diff -r a3ecd7edc382 -r 56be68853618 src/ChangeLog
--- a/src/ChangeLog	Wed Jul 03 18:42:34 2002 +0000
+++ b/src/ChangeLog	Thu Jul 04 02:10:45 2002 +0000
@@ -1,3 +1,9 @@
+2002-07-03  Andrew Choi  <akochoi@shaw.ca>
+
+	* macterm.c (init_font_name_table): Also add entry for
+	jisx0201.1976-0 coding for Japanese font.
+	(XLoadQueryFont): Use it.
+
 2002-07-02  Richard M. Stallman  <rms@gnu.org>
 
 	* keymap.c (Fdefine_key): Doc fix.
diff -r a3ecd7edc382 -r 56be68853618 src/macterm.c
--- a/src/macterm.c	Wed Jul 03 18:42:34 2002 +0000
+++ b/src/macterm.c	Thu Jul 04 02:10:45 2002 +0000
@@ -10747,8 +10747,14 @@
 							      sc));
 	      }
 	    else
-	      add_font_name_table_entry (mac_to_x_fontname (name, size, style,
-							    sc));
+	      {
+		add_font_name_table_entry (mac_to_x_fontname (name, size,
+							      style, sc));
+		if (smJapanese == sc)
+		  add_font_name_table_entry (mac_to_x_fontname (name, size,
+								style,
+								-smJapanese));
+	      }
 	}
   
       /* Dispose of the iterators.  */
@@ -10833,7 +10839,7 @@
 			    = mac_to_x_fontname (name,
 						 assc_entry->fontSize,
 						 assc_entry->fontStyle,
-						 smRoman);
+						 -smJapanese);
 			}
 		    }
 		}
@@ -11105,7 +11111,7 @@
     if (sscanf (name, 
 		"-%*[^-]-%*[^-]-%*[^-]-%*c-%*[^-]--%*[^-]-%*[^-]-%*[^-]-%*[^-]-%*c-%*[^-]-%31s",
 		cs) == 1
-	&& 0 == strcmp (cs, "mac-roman"))  
+	&& 0 == strcmp (cs, "jisx0201.1976-0"))  
       font->mac_scriptcode = smRoman;
   }