X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-config.cc;h=c15f94f87e3866982eac21d1e1776ec9c71f9be4;hb=078703a6ab29f75983a55ac2cc35fe5f315da574;hp=531a76df7643d65738f82f870494f5d53b69cb40;hpb=95158595cb380a0e2ee5fb67947150ca12f3d7ae;p=lilypond.git

diff --git a/lily/font-config.cc b/lily/font-config.cc
index 531a76df76..c15f94f87e 100644
--- a/lily/font-config.cc
+++ b/lily/font-config.cc
@@ -8,36 +8,43 @@
 
 #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 ();
+  if (!FcInit ())
+    error (_ ("initializing FontConfig failed"));
 
+  font_config_global = FcConfigGetCurrent ();
   Array<String> dirs;
+
+  /*
+    ugh. C&P main.cc
+  */
   dirs.push (prefix_directory + "/fonts/otf/");
-  dirs.push (prefix_directory + "/mf/out/");
   dirs.push (prefix_directory + "/fonts/type1/");
   dirs.push (prefix_directory + "/fonts/cff/");
-
+  dirs.push (prefix_directory + "/fonts/svg/");
+  
   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 ()));
     }
 
   if (be_verbose_global)
@@ -50,4 +57,5 @@ void
 init_fontconfig ()
 {
 }
+
 #endif