with latest fontconfig snapshot the font alias mechanist was a bit
too... "fuzzy". This patch fixes it.
Btw, while I was updating my gtk2 copy, I also updated freetype to 2.1.2
from a rpm (I don't remember from where, but most probably from
rpmfind).
This freetype was giving a horrible rendering of MS fonts. I just
compiled & installed freetype and everything was again ok. So if you
see a bad rendering with abiword, first check that your freetype is
rendering things ok.
Cheers,
--
Joaqu�n Cuenca Abela
[EMAIL PROTECTED]
diff -ru abi/src/af/xap/unix/xap_UnixFont.cpp abi3/src/af/xap/unix/xap_UnixFont.cpp
--- abi/src/af/xap/unix/xap_UnixFont.cpp Wed Jul 24 10:08:19 2002
+++ abi3/src/af/xap/unix/xap_UnixFont.cpp Thu Aug 1 20:35:23 2002
@@ -1267,13 +1267,9 @@
#endif
UT_DEBUGMSG(("After print.\n"));
- UT_DEBUGMSG(("Before open.\n"));
pXftFont = XftFontOpenPattern(GDK_DISPLAY(), result_fp);
- UT_DEBUGMSG(("After open.\n"));
- UT_DEBUGMSG(("Before destroy.\n"));
// FcPatternDestroy(result_fp);
- UT_DEBUGMSG(("After destroy.\n"));
// That means that we should should be 100% sure that,
// at this point, the font exists in the system
diff -ru abi/src/af/xap/unix/xap_UnixFontManager.cpp abi3/src/af/xap/unix/xap_UnixFontManager.cpp
--- abi/src/af/xap/unix/xap_UnixFontManager.cpp Tue Jul 16 10:12:52 2002
+++ abi3/src/af/xap/unix/xap_UnixFontManager.cpp Thu Aug 1 20:33:54 2002
@@ -39,6 +39,11 @@
// TODO get this from some higher-level place
#define FONTS_DIR_FILE "/fonts.dir"
+#ifdef USE_XFT
+static FcFontSet* XAP_UnixFontManager::m_pFontSet;
+static FcConfig* XAP_UnixFontManager::m_pConfig;
+#endif
+
#ifndef USE_XFT
static char ** s_oldFontPath = NULL;
static int s_oldFontPathCount = 0;
@@ -136,6 +141,7 @@
{
#ifdef USE_XFT
m_pFontSet = FcConfigGetFonts(FcConfigGetCurrent(), FcSetSystem);
+ m_pConfig = FcInitLoadConfigAndFonts();
//, FC_FAMILY, FC_STYLE, FC_SLANT, FC_WEIGHT, FC_SIZE, FC_FILE, 0);
#endif
}
@@ -695,7 +701,7 @@
return true;
}
-static XAP_UnixFont* searchFont(const char* pszXftName)
+XAP_UnixFont* XAP_UnixFontManager::searchFont(const char* pszXftName)
{
FcPattern* fp;
FcPattern* result_fp;
@@ -703,6 +709,10 @@
