X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-config.cc;h=742887f6846efdb84ec21a2f3d6aa1abc133350f;hb=df9112198bc2440558ef1a5517543494305dca9a;hp=ee7f8de8a438749aa8b38197d588f04a810b3bfd;hpb=106b020727245452b6eb9a29fb746b471f3fefe3;p=lilypond.git

diff --git a/lily/font-config.cc b/lily/font-config.cc
index ee7f8de8a4..742887f684 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--2007 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"
 
@@ -29,40 +30,47 @@ 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 (!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));
 			
-  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 (lilypond_datadir + "/fonts/otf/");
+  dirs.push_back (lilypond_datadir + "/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 ("failed 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");
 
-  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);
     }
   
 }