* stepmake/stepmake/*:

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

diff --git a/lily/font-config.cc b/lily/font-config.cc
index 08378da3a7ac736d9052fa5ab1a258dc177d3f4b..c15f94f87e3866982eac21d1e1776ec9c71f9be4 100644 (file)
--- a/lily/font-config.cc
+++ b/lily/font-config.cc
@@ -8,7 +8,7 @@
 
 #include "config.hh"
 
-#ifdef HAVE_FONTCONFIG
+#if HAVE_FONTCONFIG
 
 #include <fontconfig/fontconfig.h>
 #include <sys/stat.h>
@@ -16,29 +16,35 @@
 #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;
-  dirs.push (prefix_directory + "/mf/out/");
-  
+
+  /*
+    ugh. C&P main.cc
+  */
   dirs.push (prefix_directory + "/fonts/otf/");
   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)
@@ -51,4 +57,5 @@ void
 init_fontconfig ()
 {
 }
+
 #endif