From a0f593ff6ad8e60f7ca544c6649456f0523d0a8e Mon Sep 17 00:00:00 2001 From: Andrew Choi Date: Thu, 4 Jul 2002 02:10:45 +0000 Subject: [PATCH] 2002-07-03 Andrew Choi * macterm.c (init_font_name_table): Also add entry for jisx0201.1976-0 coding for Japanese font. (XLoadQueryFont): Use it. --- src/ChangeLog | 6 ++++++ src/macterm.c | 14 ++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 376bb7d5501..23e7681b2f5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2002-07-03 Andrew Choi + + * 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 * keymap.c (Fdefine_key): Doc fix. diff --git a/src/macterm.c b/src/macterm.c index ae1d7389d19..728f7337f2a 100644 --- a/src/macterm.c +++ b/src/macterm.c @@ -10747,8 +10747,14 @@ init_font_name_table () 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 @@ init_font_name_table () = mac_to_x_fontname (name, assc_entry->fontSize, assc_entry->fontStyle, - smRoman); + -smJapanese); } } } @@ -11105,7 +11111,7 @@ XLoadQueryFont (Display *dpy, char *fontname) if (sscanf (name, "-%*[^-]-%*[^-]-%*[^-]-%*c-%*[^-]--%*[^-]-%*[^-]-%*[^-]-%*[^-]-%*c-%*[^-]-%31s", cs) == 1 - && 0 == strcmp (cs, "mac-roman")) + && 0 == strcmp (cs, "jisx0201.1976-0")) font->mac_scriptcode = smRoman; } -- 2.39.5