aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/fontset.c48
1 files changed, 0 insertions, 48 deletions
diff --git a/src/fontset.c b/src/fontset.c
index 82e5b4e65de..db62e534921 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -191,7 +191,6 @@ static int next_fontset_id;
191 font for each character. */ 191 font for each character. */
192static Lisp_Object Vdefault_fontset; 192static Lisp_Object Vdefault_fontset;
193 193
194Lisp_Object Vfont_encoding_alist;
195Lisp_Object Vfont_encoding_charset_alist; 194Lisp_Object Vfont_encoding_charset_alist;
196Lisp_Object Vuse_default_ascent; 195Lisp_Object Vuse_default_ascent;
197Lisp_Object Vignore_relative_composition; 196Lisp_Object Vignore_relative_composition;
@@ -967,31 +966,6 @@ make_fontset_for_ascii_face (f, base_fontset_id, face)
967} 966}
968 967
969 968
970/* Return ENCODING or a cons of ENCODING and REPERTORY of the font
971 FONTNAME. ENCODING is a charset symbol that specifies the encoding
972 of the font. REPERTORY is a charset symbol or nil. */
973
974Lisp_Object
975find_font_encoding (fontname)
976 Lisp_Object fontname;
977{
978 Lisp_Object tail, elt;
979
980 for (tail = Vfont_encoding_alist; CONSP (tail); tail = XCDR (tail))
981 {
982 elt = XCAR (tail);
983 if (CONSP (elt)
984 && STRINGP (XCAR (elt))
985 && fast_string_match_ignore_case (XCAR (elt), fontname) >= 0
986 && (SYMBOLP (XCDR (elt))
987 ? CHARSETP (XCDR (elt))
988 : CONSP (XCDR (elt)) && CHARSETP (XCAR (XCDR (elt)))))
989 return (XCDR (elt));
990 }
991 /* We don't know the encoding of this font. Let's assume `ascii'. */
992 return Qascii;
993}
994
995 969
996/* Cache data used by fontset_pattern_regexp. The car part is a 970/* Cache data used by fontset_pattern_regexp. The car part is a
997 pattern string containing at least one wild card, the cdr part is 971 pattern string containing at least one wild card, the cdr part is
@@ -2099,28 +2073,6 @@ syms_of_fontset ()
2099 auto_fontset_alist = Qnil; 2073 auto_fontset_alist = Qnil;
2100 staticpro (&auto_fontset_alist); 2074 staticpro (&auto_fontset_alist);
2101 2075
2102 DEFVAR_LISP ("font-encoding-alist", &Vfont_encoding_alist,
2103 doc: /*
2104Alist of fontname patterns vs the corresponding encoding and repertory info.
2105Each element looks like (REGEXP . (ENCODING . REPERTORY)),
2106where ENCODING is a charset or a char-table,
2107and REPERTORY is a charset, a char-table, or nil.
2108
2109If ENCDING and REPERTORY are the same, the element can have the form
2110\(REGEXP . ENCODING).
2111
2112ENCODING is for converting a character to a glyph code of the font.
2113If ENCODING is a charset, encoding a character by the charset gives
2114the corresponding glyph code. If ENCODING is a char-table, looking up
2115the table by a character gives the corresponding glyph code.
2116
2117REPERTORY specifies a repertory of characters supported by the font.
2118If REPERTORY is a charset, all characters beloging to the charset are
2119supported. If REPERTORY is a char-table, all characters who have a
2120non-nil value in the table are supported. It REPERTORY is nil, Emacs
2121gets the repertory information by an opened font and ENCODING. */);
2122 Vfont_encoding_alist = Qnil;
2123
2124 DEFVAR_LISP ("font-encoding-charset-alist", &Vfont_encoding_charset_alist, 2076 DEFVAR_LISP ("font-encoding-charset-alist", &Vfont_encoding_charset_alist,
2125 doc: /* 2077 doc: /*
2126Alist of charsets vs the charsets to determine the preferred font encoding. 2078Alist of charsets vs the charsets to determine the preferred font encoding.