(XLFD_SMALLNUM_MASK): Delete this macro. (XLFD_LARGENUM_MASK): Delete XLFD_ENCODING_MASK from it. (font_expand_wildcards): Fix handling ENCODING field. Avoid unnecessary checks for weight, slant, and swidth. (font_parse_fcname): New function. (font_unparse_fcname): New function. (font_parse_name): New function. (font_match_p): New function. (font_get_name): Return value changed to Lisp string. (font_get_spec): New function. (Qunspecified, Qignore_defface): Don't extern them. (font_find_for_lface): Assume that LFACE is fully specified. (font_load_for_face): If lface[LFACE_FONT_INDEX] is an font object, use it for FACE. (font_open_by_name): Call Ffont_spec with QCname prop. Don't call driver->parse_name. (Ffont_spec): Call font_parse_name, not font_parse_xlfd.