Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / font-config.cc

diff --git a/lily/font-config.cc b/lily/font-config.cc
index cbf77c7944d012c9186e50edb1c1dd7143a1f034..b59325f55a8e2b890b23f31675be62b24cc9b048 100644 (file)
--- a/lily/font-config.cc
+++ b/lily/font-config.cc
@@ -30,18 +30,12 @@ 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.
    */ 
-  if (cache_file
-      && !is_file ((char const *)cache_file))
-    message (_f ("Rebuilding FontConfig cache %s, this may take a while...", cache_file));
+  if (!is_file ((char*)cache_file))
+    message (_f ("Rebuilding FontConfig cache %s. this may take a while...", cache_file));
                        
   vector<string> dirs;
 
@@ -52,7 +46,7 @@ init_fontconfig ()
     {
       string dir = dirs[i];
       if (!FcConfigAppFontAddDir (font_config_global, (FcChar8 *)dir.c_str ()))
-       error (_f ("failed adding font directory: %s", dir.c_str ()));
+       error (_f ("adding font directory: %s", dir.c_str ()));
       else if (be_verbose_global)
        message (_f ("adding font directory: %s", dir.c_str ()));
     }
@@ -64,8 +58,7 @@ init_fontconfig ()
   if (be_verbose_global)
     progress_indication ("\n");
 
-  if (cache_file
-      && !is_file ((char*)cache_file))
+  if (!is_file ((char*)cache_file))
     {
       /* inhibit future messages. */
       FILE *f = fopen ((char*)cache_file, "w");