Mercurial > emacs
comparison src/macterm.c @ 46168:56be68853618
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.
| author | Andrew Choi <akochoi@shaw.ca> |
|---|---|
| date | Thu, 04 Jul 2002 02:10:45 +0000 |
| parents | 2198a6632b2b |
| children | 36989d5089ee |
comparison
equal
deleted
inserted
replaced
| 46167:a3ecd7edc382 | 46168:56be68853618 |
|---|---|
| 10745 add_font_name_table_entry (mac_to_x_fontname (name, size, | 10745 add_font_name_table_entry (mac_to_x_fontname (name, size, |
| 10746 italic | bold, | 10746 italic | bold, |
| 10747 sc)); | 10747 sc)); |
| 10748 } | 10748 } |
| 10749 else | 10749 else |
| 10750 add_font_name_table_entry (mac_to_x_fontname (name, size, style, | 10750 { |
| 10751 sc)); | 10751 add_font_name_table_entry (mac_to_x_fontname (name, size, |
| 10752 style, sc)); | |
| 10753 if (smJapanese == sc) | |
| 10754 add_font_name_table_entry (mac_to_x_fontname (name, size, | |
| 10755 style, | |
| 10756 -smJapanese)); | |
| 10757 } | |
| 10752 } | 10758 } |
| 10753 | 10759 |
| 10754 /* Dispose of the iterators. */ | 10760 /* Dispose of the iterators. */ |
| 10755 FMDisposeFontFamilyIterator (&ffi); | 10761 FMDisposeFontFamilyIterator (&ffi); |
| 10756 FMDisposeFontFamilyInstanceIterator (&ffii); | 10762 FMDisposeFontFamilyInstanceIterator (&ffii); |
| 10831 { | 10837 { |
| 10832 font_name_table[font_name_count++] | 10838 font_name_table[font_name_count++] |
| 10833 = mac_to_x_fontname (name, | 10839 = mac_to_x_fontname (name, |
| 10834 assc_entry->fontSize, | 10840 assc_entry->fontSize, |
| 10835 assc_entry->fontStyle, | 10841 assc_entry->fontStyle, |
| 10836 smRoman); | 10842 -smJapanese); |
| 10837 } | 10843 } |
| 10838 } | 10844 } |
| 10839 } | 10845 } |
| 10840 | 10846 |
| 10841 HUnlock (font_handle); | 10847 HUnlock (font_handle); |
| 11103 char cs[32]; | 11109 char cs[32]; |
| 11104 | 11110 |
| 11105 if (sscanf (name, | 11111 if (sscanf (name, |
| 11106 "-%*[^-]-%*[^-]-%*[^-]-%*c-%*[^-]--%*[^-]-%*[^-]-%*[^-]-%*[^-]-%*c-%*[^-]-%31s", | 11112 "-%*[^-]-%*[^-]-%*[^-]-%*c-%*[^-]--%*[^-]-%*[^-]-%*[^-]-%*[^-]-%*c-%*[^-]-%31s", |
| 11107 cs) == 1 | 11113 cs) == 1 |
| 11108 && 0 == strcmp (cs, "mac-roman")) | 11114 && 0 == strcmp (cs, "jisx0201.1976-0")) |
| 11109 font->mac_scriptcode = smRoman; | 11115 font->mac_scriptcode = smRoman; |
| 11110 } | 11116 } |
| 11111 | 11117 |
| 11112 is_two_byte_font = font->mac_scriptcode == smJapanese || | 11118 is_two_byte_font = font->mac_scriptcode == smJapanese || |
| 11113 font->mac_scriptcode == smTradChinese || | 11119 font->mac_scriptcode == smTradChinese || |