X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-config.cc;h=8cbd46d9ccb8d0a475598fd6f3b98b4567a82938;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=0fde98731da633dbf58c919274abf48f82da8ffc;hpb=45e75ec196d9766d5063c62f3487b96c8d76d681;p=lilypond.git

diff --git a/lily/font-config.cc b/lily/font-config.cc
index 0fde98731d..8cbd46d9cc 100644
--- a/lily/font-config.cc
+++ b/lily/font-config.cc
@@ -1,42 +1,87 @@
 /*
-  font-config.cc -- implement Font_config related functions
+  font-config.cc -- implement FontConfig related functions
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
-
+  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "config.hh"
 
-#ifdef HAVE_PANGO_FT2
+#if HAVE_FONTCONFIG
 
 #include <fontconfig/fontconfig.h>
+#include <sys/stat.h>
 
+#include "file-path.hh"
+#include "international.hh"
 #include "main.hh"
 #include "warn.hh"
 
+
+FcConfig *font_config_global = 0;
+
 void
 init_fontconfig ()
 {
-  if (!FcInit())
+  if (be_verbose_global)
+    message (_ ("Initializing 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 (cache_file
+      && !is_file ((char const *)cache_file))
+    message (_f ("Rebuilding FontConfig cache %s, this may take a while...", cache_file));
+			
+  vector<string> dirs;
+
+  /* Extra trailing slash suddenly breaks fontconfig (fc-cache 2.5.0)
+     on windows.  */
+  dirs.push_back (lilypond_datadir + "/fonts/otf");
+  dirs.push_back (lilypond_datadir + "/fonts/type1");
+  
+  for (vsize i = 0; i < dirs.size (); i++)
     {
-      error ("FontConfig failed to initialize"); 
+      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.c_str ()));
     }
+  
+  if (be_verbose_global)
+    message (_ ("Building font database."));
+  FcConfigBuildFonts (font_config_global);
+  FcConfigSetCurrent (font_config_global);
+  if (be_verbose_global)
+    message ("\n");
 
-  char const **dirs = prefix_directories;
-  for (; *dirs; dirs++)
+  if (cache_file
+      && !is_file ((char*)cache_file))
     {
-      String path = String (*dirs) + "/" + "otf";
-      
-      if (!FcConfigAppFontAddDir (0, (FcChar8*)path.to_str0 ()))
-	{
-	  error (_f ("Failed to add lilypond directory %s", path.to_str0 ()));
-	}
-    }     
+      /* inhibit future messages. */
+      FILE *f = fopen ((char*)cache_file, "w");
+      if (f)
+	fclose (f);
+    }
+  
 }
 
 #else
 
-void init_fontconfig() {}
+void
+init_fontconfig ()
+{
+}
+
 #endif