X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-config.cc;h=8cbd46d9ccb8d0a475598fd6f3b98b4567a82938;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=afa210a7ad4faba7d0ea887d4ee4634e10138333;hpb=3f1e8dc68d267b039b9e231564d0e60c67d14429;p=lilypond.git

diff --git a/lily/font-config.cc b/lily/font-config.cc
index afa210a7ad..8cbd46d9cc 100644
--- a/lily/font-config.cc
+++ b/lily/font-config.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "config.hh"
@@ -30,9 +30,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.
@@ -43,8 +45,10 @@ 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++)
     {
@@ -56,11 +60,11 @@ init_fontconfig ()
     }
   
   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))