X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-config.cc;h=7737068c2eb1c55f215db09d79cf71d782162261;hb=a640ea0e23770a906ec19eda0a67e556b49597fe;hp=7cea2fcfdee321295085ff37b64a572512fa05a9;hpb=fe2760bf2b14dd6f55c1fefa055da3c3434837b9;p=lilypond.git

diff --git a/lily/font-config.cc b/lily/font-config.cc
index 7cea2fcfde..7737068c2e 100644
--- a/lily/font-config.cc
+++ b/lily/font-config.cc
@@ -3,13 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "config.hh"
 
 #if HAVE_FONTCONFIG
 
+#include <cstdio>
 #include <fontconfig/fontconfig.h>
 #include <sys/stat.h>
 
@@ -30,6 +31,11 @@ init_fontconfig ()
   font_config_global = FcInitLoadConfig ();
   FcChar8 *cache_file = FcConfigGetCache (font_config_global);
 
+#if 0
+  // always returns 0 for FC 2.4
+  if (!cache_file)
+    programming_error ("Cannot find file for FontConfig cache.");
+#endif
   /*
     This is a terrible kludge, but there is apparently no way for
     FontConfig to signal whether it needs to rescan directories.
@@ -40,24 +46,26 @@ init_fontconfig ()
 			
   vector<string> dirs;
 
-  dirs.push_back (prefix_directory + "/fonts/otf/");
-  dirs.push_back (prefix_directory + "/fonts/type1/");
+  /* Extra trailing slash suddenly breaks fontconfig (fc-cache 2.5.0)
+     on windows.  */
+  dirs.push_back (lilypond_datadir + "/fonts/otf");
+  dirs.push_back (lilypond_datadir + "/fonts/type1");
   
   for (vsize i = 0; i < dirs.size (); i++)
     {
       string dir = dirs[i];
       if (!FcConfigAppFontAddDir (font_config_global, (FcChar8 *)dir.c_str ()))
-	error (_f ("adding font directory: %s", dir.c_str ()));
+	error (_f ("failed adding font directory: %s", dir.c_str ()));
       else if (be_verbose_global)
 	message (_f ("adding font directory: %s", dir.c_str ()));
     }
   
   if (be_verbose_global)
-    progress_indication ("Building font database.\n");
+    message (_ ("Building font database."));
   FcConfigBuildFonts (font_config_global);
   FcConfigSetCurrent (font_config_global);
   if (be_verbose_global)
-    progress_indication ("\n");
+    message ("\n");
 
   if (cache_file
       && !is_file ((char*)cache_file))