Mercurial > emacs

comparison src/ftfont.c @ 103011:8f0fbb48af5a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* font.c (Qja, Qko): Move definitions here from ftfont.c. * font.h (Qja, Qko): Extern them. * ftfont.c (Qja, Qko): Remove declarations. * xfont.c (Qja, Qko): Remove declarations.
author Chong Yidong <cyd@stupidchicken.com>
date Fri, 17 Apr 2009 18:38:00 +0000
parents bf88e5d2f4af
children 941b1ddcbe2e
comparison
equal deleted inserted replaced
103010:ed58f741d35f 103011:8f0fbb48af5a
40 /* Symbolic type of this font-driver. */ 40 /* Symbolic type of this font-driver. */
41 Lisp_Object Qfreetype; 41 Lisp_Object Qfreetype;
42 42
43 /* Fontconfig's generic families and their aliases. */ 43 /* Fontconfig's generic families and their aliases. */
44 static Lisp_Object Qmonospace, Qsans_serif, Qserif, Qmono, Qsans, Qsans__serif; 44 static Lisp_Object Qmonospace, Qsans_serif, Qserif, Qmono, Qsans, Qsans__serif;
45
46 /* Special ADSTYLE properties to avoid fonts used for Latin characters. */
47 Lisp_Object Qja, Qko;
48 45
49 /* Flag to tell if FcInit is already called or not. */ 46 /* Flag to tell if FcInit is already called or not. */
50 static int fc_initialized; 47 static int fc_initialized;
51 48
52 /* Handle to a FreeType library instance. */ 49 /* Handle to a FreeType library instance. */
2227 DEFSYM (Qsans_serif, "sans-serif"); 2224 DEFSYM (Qsans_serif, "sans-serif");
2228 DEFSYM (Qserif, "serif"); 2225 DEFSYM (Qserif, "serif");
2229 DEFSYM (Qmono, "mono"); 2226 DEFSYM (Qmono, "mono");
2230 DEFSYM (Qsans, "sans"); 2227 DEFSYM (Qsans, "sans");
2231 DEFSYM (Qsans__serif, "sans serif"); 2228 DEFSYM (Qsans__serif, "sans serif");
2232 DEFSYM (Qja, "ja");
2233 DEFSYM (Qko, "ko");
2234 2229
2235 staticpro (&freetype_font_cache); 2230 staticpro (&freetype_font_cache);
2236 freetype_font_cache = Fcons (Qt, Qnil); 2231 freetype_font_cache = Fcons (Qt, Qnil);
2237 2232
2238 staticpro (&ftfont_generic_family_list); 2233 staticpro (&ftfont_generic_family_list);