* scripts/lilypond-book.py (process_snippets): Argument fix.

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

diff --git a/lily/font-config.cc b/lily/font-config.cc
index 66aba66409ce42da83fa4f17ce577dcf8b269214..ad66c7870834fc8ffd9e5370bfc6263ede258188 100644 (file)
--- a/lily/font-config.cc
+++ b/lily/font-config.cc
@@ -30,27 +30,35 @@ init_fontconfig ()
   font_config_global = FcInitLoadConfig ();
   FcChar8 *cache_file = FcConfigGetCache (font_config_global);
 
+  if (!cache_file)
+    {
+      programming_error ("global fontconfig cache_file not found");
+      return;
+    }
+  
   /*
     This is a terrible kludge, but there is apparently no way for
     FontConfig to signal whether it needs to rescan directories.
    */ 
   if (!is_file ((char*)cache_file))
-    message (_f ("Rebuilding FontConfig cache %s. this may take a while...", cache_file));
+    message (_f ("Rebuilding FontConfig cache %s, this may take a while...", cache_file));
                        
-  Array<std::string> dirs;
+  vector<string> dirs;
 
-  dirs.push (prefix_directory + "/fonts/otf/");
-  dirs.push (prefix_directory + "/fonts/type1/");
+  dirs.push_back (prefix_directory + "/fonts/otf/");
+  dirs.push_back (prefix_directory + "/fonts/type1/");
   
-  for (int i = 0; i < dirs.size (); i++)
+  for (vsize i = 0; i < dirs.size (); i++)
     {
-      std::string dir = dirs[i];
+      string dir = dirs[i];
       if (!FcConfigAppFontAddDir (font_config_global, (FcChar8 *)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 ()));
     }
-
+  
+  if (be_verbose_global)
+    progress_indication ("Building font database.\n");
   FcConfigBuildFonts (font_config_global);
   FcConfigSetCurrent (font_config_global);
   if (be_verbose_global)
@@ -60,7 +68,8 @@ init_fontconfig ()
     {
       /* inhibit future messages. */
       FILE *f = fopen ((char*)cache_file, "w");
-      fclose (f);
+      if (f)
+       fclose (f);
     }
   
 }