|
|
@ -244,12 +244,13 @@ void TDEFontCombo::setCurrentFont(const TQString &family)
|
|
|
|
// check again to solve an alias
|
|
|
|
// check again to solve an alias
|
|
|
|
FcPattern *pattern = NULL;
|
|
|
|
FcPattern *pattern = NULL;
|
|
|
|
FcConfig *config = NULL;
|
|
|
|
FcConfig *config = NULL;
|
|
|
|
|
|
|
|
FcResult result;
|
|
|
|
TQString realFamily;
|
|
|
|
TQString realFamily;
|
|
|
|
TQRegExp regExp("[-:]");
|
|
|
|
TQRegExp regExp("[-:]");
|
|
|
|
pattern = FcNameParse( (unsigned char*) family.ascii() );
|
|
|
|
pattern = FcNameParse( (unsigned char*) family.ascii() );
|
|
|
|
FcDefaultSubstitute(pattern);
|
|
|
|
FcDefaultSubstitute(pattern);
|
|
|
|
FcConfigSubstitute (config, pattern, FcMatchPattern);
|
|
|
|
FcConfigSubstitute (config, pattern, FcMatchPattern);
|
|
|
|
pattern = FcFontMatch(NULL, pattern, NULL);
|
|
|
|
pattern = FcFontMatch(NULL, pattern, &result);
|
|
|
|
realFamily = (char*)FcNameUnparse(pattern);
|
|
|
|
realFamily = (char*)FcNameUnparse(pattern);
|
|
|
|
realFamily.remove(realFamily.find(regExp), realFamily.length());
|
|
|
|
realFamily.remove(realFamily.find(regExp), realFamily.length());
|
|
|
|
|
|
|
|
|
|
|
|