[Emacs-commit] emacs/src macterm.c

[YAMAMOTO Mitsuharu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         
Changes by:     YAMAMOTO Mitsuharu <address@hidden>     05/10/11 03:35:37

Modified files:
        src            : macterm.c 

Log message:
        (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.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/src/macterm.c.diff?tr1=1.133&tr2=1.134&r1=text&r2=text