User: stephent Date: 05/02/24 12:08:30 Modified: xemacs/src Tag: sjt-xft ChangeLog objects-x.c Log: fix FcConfigSubstitute call <877jkyw70y.fsf(a)tleepslib.sk.tsukuba.ac.jp&gt; Revision Changes Path No revision No revision 1.758.2.15 +5 -0 XEmacs/xemacs/src/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v retrieving revision 1.758.2.14 retrieving revision 1.758.2.15 diff -u -r1.758.2.14 -r1.758.2.15 --- ChangeLog 2005/02/24 09:32:25 1.758.2.14 +++ ChangeLog 2005/02/24 11:08:24 1.758.2.15 ＠＠ -1,5 +1,10 ＠＠ 2005-02-24 Stephen J. Turnbull <stephen(a)xemacs.org&gt; + * objects-x.c (x_find_charset_font): ConfigSubstitute in the + _pattern_ before matching. + +2005-02-24 Stephen J. Turnbull <stephen(a)xemacs.org&gt; + * faces.c (complex_vars_of_faces): Default to monospace-12 for Xft. (Suggestion by Aidan Kehoe.) 1.26.2.9 +11 -6 XEmacs/xemacs/src/objects-x.c Index: objects-x.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/objects-x.c,v retrieving revision 1.26.2.8 retrieving revision 1.26.2.9 diff -u -r1.26.2.8 -r1.26.2.9 --- objects-x.c 2005/02/21 08:43:33 1.26.2.8 +++ objects-x.c 2005/02/24 11:08:27 1.26.2.9 ＠＠ -1059,14 +1059,12 ＠＠ FcChar8 *lang = "en"; fcc = FcConfigGetCurrent (); patternxft = FcNameParse (patternext); - /* #### Next four return FcBool, but what does the return mean? */ - /* #### There's probably a way to do this with FcCharsets, but isn't - the language approach better in the long run? */ - /* #### can we regression test this, or does it break too early? */ if (debug_xft > 1) stderr_out ("FcNameParse'ed name is %s\n", FcNameUnparse (patternxft)); - FcConfigSubstitute (fcc, patternxft, FcMatchFont); + /* #### Next two return FcBool, but what does the return mean? */ + /* #### I wonder if the order of the next two should be reversed. */ + FcConfigSubstitute (fcc, patternxft, FcMatchPattern); if (debug_xft > 1) stderr_out ("FcConfigSubstitute'ed name is %s\n", FcNameUnparse (patternxft)); ＠＠ -1074,6 +1072,14 ＠＠ if (debug_xft > 0) stderr_out ("FcDefaultSubstitute'ed name is %s\n", FcNameUnparse (patternxft)); + patternxft = FcFontMatch (fcc, patternxft, &fcresult); + if (debug_xft > 0) + stderr_out ("FcFontMatch'ed name is %s\n", + FcNameUnparse (patternxft)); + + /* #### There's probably a way to do this with FcCharsets, but isn't + the language approach better in the long run? */ + /* #### can we regression test this, or does it break too early? */ if (EQ (charset, Fget_charset (intern ("katakana-jisx0201"))) || EQ (charset, Fget_charset (intern ("japanese-jisx0208"))) || EQ (charset, Fget_charset (intern ("japanese-jisx0212")))) ＠＠ -1097,7 +1103,6 ＠＠ /* default to "en" */ } - patternxft = FcFontMatch (fcc, patternxft, &fcresult); /* #### stderr_out crashed in the next block; why? probably because FcTypeOfValueToString below didn't get an argument!! Fixed now, but watch for crashes. */