* stepmake/stepmake/*:

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

diff --git a/lily/font-config.cc b/lily/font-config.cc
index 48b4fba100b95591e41ae71d0a92f0292c1f6390..c15f94f87e3866982eac21d1e1776ec9c71f9be4 100644 (file)
--- a/lily/font-config.cc
+++ b/lily/font-config.cc
@@ -1,49 +1,61 @@
 /*
-  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"
-#include "file-path.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 ();
+  if (!FcInit ())
+    error (_ ("initializing FontConfig failed"));
 
-  
+  font_config_global = FcConfigGetCurrent ();
   Array<String> dirs;
-  dirs.push (prefix_directory + "/otf/");
-  dirs.push (prefix_directory + "/mf/out/");
-  dirs.push (prefix_directory + "/type1/");
+
+  /*
+    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++)
+  for (int i = 0; i < dirs.size (); i++)
     {
-      String path = dirs[i];
-      if (!FcConfigAppFontAddDir (fcc, (FcChar8*)path.to_str0 ()))
-       {
-         error (_f ("Failed to add lilypond directory %s", path.to_str0 ()));
-       }
-    }     
+      String dir = dirs[i];
+      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_indication ("\n");
 }
 
 #else
 
-void init_fontconfig() {}
+void
+init_fontconfig ()
+{
+}
+
 #endif