#include "config.hh"
-#ifdef HAVE_FONTCONFIG
+#if HAVE_FONTCONFIG
#include <fontconfig/fontconfig.h>
#include <sys/stat.h>
#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;
-
- 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/");
- }
-
-
+ /*
+ 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.to_str0 ()));
+ if (!FcConfigAppFontAddDir (font_config_global, (FcChar8 *)dir.to_str0 ()))
+ error (_f ("adding font directory: %s", dir.to_str0 ()));
else if (be_verbose_global)
- progress_indication (_f ("Adding font directory %s\n", dir.to_str0 ()));
+ message (_f ("adding font directory: %s", dir.to_str0 ()));
}
if (be_verbose_global)
init_fontconfig ()
{
}
+
#endif