[Emacs-commit] emacs/src fontset.c

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kenichi Handa <handa>   08/05/14 01:26:47

Modified files:
        src            : fontset.c 

Log message:
        Throughout the file, delete all USE_FONT_BACKEND
        conditionals.  Don't check enable_font_backend.  Delete all codes
        used only when USE_FONT_BACKEND is not defined.
        (get_font_info_func, list_font_func, load_font_func)
        (query_font_func, set_frame_fontset_func, find_ccl_program_func)
        (get_font_repertory_func): Delete them.
        (FONTSET_SPEC, FONT_DEF_NEW, FONT_DEF_SPEC, FONT_DEF_ENCODING)
        (FONT_DEF_REPERTORY, RFONT_DEF_FACE, RFONT_DEF_SET_FACE)
        (RFONT_DEF_FONT_DEF, RFONT_DEF_SPEC, RFONT_DEF_REPERTORY)
        (RFONT_DEF_OBJECT, RFONT_DEF_SET_OBJECT, RFONT_DEF_SCORE)
        (RFONT_DEF_SET_SCORE, RFONT_DEF_NEW): New macros.
        (fontset_compare_rfontdef): New function.
        (reorder_font_vector): Remove the argument CHARSET-ID.  Sort
        ront-defs by qsort.  Adjusted for the change of font-group vector.
        (load_font_get_repertory): Deleted.
        (fontset_find_font): Use new macros to ref/set elements of
        font-def and rfont-def.
        (fontset_font): Fix the timing of remembering that no font for C.
        (free_face_fontset): Do nothing if the face has no fontset.
        (face_suitable_for_char_p): Use new macros to ref/set elements of
        rfont-def.
        (face_for_char): Likewise.  Call face_for_char with font_object.
        (fs_load_font): Delete.  Delete #pragma surrounding it.
        (fs_query_fontset): Use strcasecmp instead of strcmp.
        (generate_ascii_font_name): Adjusted for the format change of
        font-spec.
        (Fset_fontset_font): Likewise.  Use new macros to set elements of
        font-def.
        (Fnew_fontset): Use font_unparse_xlfd to generate
        FONTSET_ASCII (fontset).
        (new_fontset_from_font_name): Deleted.
        (fontset_from_font): Renamed from new_fontset_from_font.  Check if
        a fontset is already created for the font.  FIx updating of
        Vfontset_alias_alist.
        (fontset_ascii_font): Deleted.
        (Ffont_info): Adjusted for the format change of font-spec.
        (Finternal_char_font): Likewise.
        (Ffontset_info): Likewise.
        (syms_of_fontset): Don't check load_font_func.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/fontset.c?cvsroot=emacs&r1=1.116&r2=1.117