(y_offset_callback): bugfix: decide position

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

diff --git a/lily/font-config.cc b/lily/font-config.cc
index 1e39ecbffbec15020894617d1da497e5651046f5..7cea2fcfdee321295085ff37b64a572512fa05a9 100644 (file)
--- a/lily/font-config.cc
+++ b/lily/font-config.cc
@@ -14,6 +14,7 @@
 #include <sys/stat.h>
 
 #include "file-path.hh"
+#include "international.hh"
 #include "main.hh"
 #include "warn.hh"
 
@@ -33,33 +34,38 @@ init_fontconfig ()
     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));
+  if (cache_file
+      && !is_file ((char const *)cache_file))
+    message (_f ("Rebuilding FontConfig cache %s, this may take a while...", cache_file));
                        
-  Array<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++)
     {
-      String dir = dirs[i];
-      if (!FcConfigAppFontAddDir (font_config_global, (FcChar8 *)dir.to_str0 ()))
-       error (_f ("adding font directory: %s", dir.to_str0 ()));
+      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.to_str0 ()));
+       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)
     progress_indication ("\n");
 
-  if (!is_file ((char*)cache_file))
+  if (cache_file
+      && !is_file ((char*)cache_file))
     {
       /* inhibit future messages. */
       FILE *f = fopen ((char*)cache_file, "w");
-      fclose (f);
+      if (f)
+       fclose (f);
     }
   
 }