(init_fontconfig): verbosity.

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

diff --git a/lily/font-config.cc b/lily/font-config.cc
index eb8b4f80c00cf8c619b36ddccf2c1e5b1c3d54b1..ee7f8de8a438749aa8b38197d588f04a810b3bfd 100644 (file)
--- a/lily/font-config.cc
+++ b/lily/font-config.cc
@@ -8,51 +8,63 @@
 
 #include "config.hh"
 
-#ifdef HAVE_FONTCONFIG
+#if HAVE_FONTCONFIG
 
 #include <fontconfig/fontconfig.h>
 #include <sys/stat.h>
+
 #include "file-path.hh"
 #include "main.hh"
 #include "warn.hh"
 
+
+FcConfig *font_config_global = 0;
+
 void
 init_fontconfig ()
 {
   if (be_verbose_global)
-    progress_indication (_("Initializing FontConfig ..."));
-  
-  if (!FcInit ())
-    error (_ ("FontConfig failed to initialize"));
+    message (_ ("Initializing FontConfig..."));
 
-  FcConfig *fcc = FcConfigGetCurrent ();
+  font_config_global = FcInitLoadConfig ();
+  FcChar8 *cache_file = FcConfigGetCache (font_config_global);
 
+  /*
+    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));
+                       
+  FcConfigBuildFonts (font_config_global);
+  FcConfigSetCurrent (font_config_global);
+  
   Array<String> dirs;
 
-
-  struct stat statbuf; 
-  String builddir = prefix_directory + "/mf/out/";
-  if (stat (builddir.to_str0 (), &statbuf) != 0)
-    {
-      dirs.push (builddir.to_str0 ());
-    }
-  else
-    {
-      dirs.push (prefix_directory + "/fonts/otf/");
-      dirs.push (prefix_directory + "/fonts/type1/");
-      dirs.push (prefix_directory + "/fonts/cff/");
-      dirs.push (prefix_directory + "/fonts/svg/");
-  }
+  dirs.push (prefix_directory + "/fonts/otf/");
+  dirs.push (prefix_directory + "/fonts/type1/");
   
   for (int i = 0; i < dirs.size (); i++)
     {
       String dir = dirs[i];
-      if (!FcConfigAppFontAddDir (fcc, (FcChar8 *)dir.to_str0 ()))
-       error (_f ("Failed to add lilypond directory %s", dir));
+      if (!FcConfigAppFontAddDir (font_config_global, (FcChar8 *)dir.to_str0 ()))
+       error (_f ("adding font directory: %s", dir.to_str0 ()));
+      else if (be_verbose_global)
+       message (_f ("adding font directory: %s", dir.to_str0 ()));
     }
 
+  font_config_global = FcConfigGetCurrent ();
+  
   if (be_verbose_global)
     progress_indication ("\n");
+
+  if (!is_file ((char*)cache_file))
+    {
+      /* inhibit future messages. */
+      FILE *f = fopen ((char*)cache_file, "w");
+      fclose (f);
+    }
+  
 }
 
 #else
@@ -61,4 +73,5 @@ void
 init_fontconfig ()
 {
 }
+
 #endif