X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-config.cc;h=96247f6f767cddb09db35a7597c1c8c59dce68a8;hb=543171165412bc915d8ea1f308d070c74924b2f1;hp=ff2cb3f9ab46e28fa7ce2f6a8b3e2c1de08594f7;hpb=10fce7970987502ec8340819411897a829f6be23;p=lilypond.git

diff --git a/lily/font-config.cc b/lily/font-config.cc
index ff2cb3f9ab..96247f6f76 100644
--- a/lily/font-config.cc
+++ b/lily/font-config.cc
@@ -1,42 +1,81 @@
 /*
-  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 <cstdio>
 #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 ())
-    error (_ ("FontConfig failed to initialize"));
+  if (be_verbose_global)
+    message (_ ("Initializing FontConfig..."));
 
-  FcConfig *fcc = FcConfigGetCurrent ();
+  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;
 
-  Array<String> dirs;
-  dirs.push (prefix_directory + "/otf/");
-  dirs.push (prefix_directory + "/mf/out/");
-  dirs.push (prefix_directory + "/type1/");
-  dirs.push (prefix_directory + "/cff/");
+  /* 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 (int i = 0; i < dirs.size (); i++)
+  for (vsize 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));
-    }     
+      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");
+
+  if (cache_file
+      && !is_file ((char*)cache_file))
+    {
+      /* inhibit future messages. */
+      FILE *f = fopen ((char*)cache_file, "w");
+      if (f)
+	fclose (f);
+    }
+  
 }
 
 #else
@@ -45,4 +84,5 @@ void
 init_fontconfig ()
 {
 }
+
 #endif