* stepmake/aclocal.m4 (STEPMAKE_PANGO_FT2): Define HAVE_PANGO16 too.

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

diff --git a/lily/font-config.cc b/lily/font-config.cc
index f46beaffd2442ee876e23f2ec51e69c9e79064b1..b9ba8b41a3cfc9714dd18d3b0f2a141d62171d1d 100644 (file)
--- a/lily/font-config.cc
+++ b/lily/font-config.cc
@@ -1,18 +1,17 @@
 /*
-  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>
-
 */
 
 #include "config.hh"
 
-#ifdef HAVE_PANGO_FT2
+#if HAVE_FONTCONFIG
 
 #include <fontconfig/fontconfig.h>
-
+#include <sys/stat.h>
 #include "file-path.hh"
 #include "main.hh"
 #include "warn.hh"
@@ -20,23 +19,38 @@
 void
 init_fontconfig ()
 {
+  if (be_verbose_global)
+    message (_ ("Initializing FontConfig..."));
+  
   if (!FcInit ())
-    error (_ ("FontConfig failed to initialize"));
+    error (_ ("initializing FontConfig"));
 
   FcConfig *fcc = 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/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 (fcc, (FcChar8 *)dir.to_str0 ()))
+       error (_f ("adding lilypond directory: %s", dir.to_str0 ()));
+      else if (be_verbose_global)
+       message (_f ("adding font directory: %s", dir.to_str0 ()));
+    }
+
+  if (be_verbose_global)
+    progress_indication ("\n");
 }
 
 #else