(PER_CHAR_METRIC): Remove unused macro.
authorYAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Tue, 11 Oct 2005 03:35:54 +0000 (03:35 +0000)
committerYAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Tue, 11 Oct 2005 03:35:54 +0000 (03:35 +0000)
commit71b7a47f7972000021bade3c1cab8e34a0ce9d0c
tree90d1f9955b1442b4bf38418f1fd60950dc3cd097
parent3c02eaa7d35f169f2d17f0d02bfc5c41ea8ef9c9
(PER_CHAR_METRIC): Remove unused macro.
(fm_font_family_alist): New variable.
(syms_of_macterm): Initialize and staticpro it.
(decode_mac_font_name): Replace '-' in family name with '_' if it
occurs just once.  Lower family name.
(parse_x_font_name): Rename from x_font_name_to_mac_font_name.
All uses changed.  Remove argument MF and code conversion for it.
Add argument SIZE.  Rename argument MF_DECODED to FAMILY, and CS
to CHARSET.  Parse font size.  Lower family name.  Return integer
value for status of parsing.
(init_font_name_table) [USE_ATSUI]: Use decode_mac_font_name.
Don't use Fdowncase because family name is already lowered by
decode_mac_font_name.
(init_font_name_table): Always call decode_mac_font_name.  Add
pair of family name and its reference to fm_font_family_alist.
(mac_clear_font_name_table): Clear fm_font_family_alist.
(XLoadQueryFont): Move font size parsing part to parse_x_font_name.
Lookup fm_font_family_alist to get font family reference.
(XLoadQueryFont) [USE_ATSUI]: Don't use Fdowncase because family
name is already lowered by parse_x_font_name.
src/ChangeLog
src/macterm.c