X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-config.cc;h=cd21688ad7b0e8e5250c3df315aa74d7193c7c37;hb=11816bfa82647652f10acefb44ea53f793c4cc50;hp=cc116caefa1722149fae629a9e890ad4c22e63e5;hpb=588ed028a5d4e58b0b2441333965e9cedb845a63;p=lilypond.git

diff --git a/lily/font-config.cc b/lily/font-config.cc
index cc116caefa..cd21688ad7 100644
--- a/lily/font-config.cc
+++ b/lily/font-config.cc
@@ -8,40 +8,50 @@
 
 #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 (_("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;
-  dirs.push (prefix_directory + "/fonts/otf/");
-  dirs.push (prefix_directory + "/mf/out/");
-  dirs.push (prefix_directory + "/fonts/type1/");
-  dirs.push (prefix_directory + "/fonts/cff/");
+  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/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)
-    progress ("\n");
+    progress_indication ("\n");
 }
 
 #else
@@ -50,4 +60,5 @@ void
 init_fontconfig ()
 {
 }
+
 #endif