X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-config.cc;h=393feb2b6c93c9a23e9c961199c4fb404af1837a;hb=68d7330f72a14a8df49c49ed1566179248096092;hp=679bb67e7940d8a6d50ac013aa4b72498bdafc5c;hpb=671020aabbf0d8d10e1fa5f7e20e33e92df085fc;p=lilypond.git

diff --git a/lily/font-config.cc b/lily/font-config.cc
index 679bb67e79..393feb2b6c 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 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "config.hh"
@@ -14,6 +14,7 @@
 #include <sys/stat.h>
 
 #include "file-path.hh"
+#include "international.hh"
 #include "main.hh"
 #include "warn.hh"
 
@@ -34,27 +35,26 @@ init_fontconfig ()
     FontConfig to signal whether it needs to rescan directories.
    */ 
   if (!is_file ((char*)cache_file))
-    message (_ ("Rebuilding FontConfig cache; this may take a while..."));
+    message (_f ("Rebuilding FontConfig cache %s. this may take a while...", cache_file));
 			
-  FcConfigBuildFonts (font_config_global);
-  FcConfigSetCurrent (font_config_global);
-  
-  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 ()));
     }
-
-  font_config_global = FcConfigGetCurrent ();
   
+  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");