debug_output (_ ("Initializing FontConfig..."));
/* TODO: Find a way for Fontconfig to update its cache, if needed. */
- font_config_global = FcInitLoadConfig ();
+ FcInitLoadConfig ();
- vector<string> dirs;
+ /* Create an empty configuration */
+ font_config_global = FcConfigCreate ();
- /* Extra trailing slash suddenly breaks fontconfig (fc-cache 2.5.0)
- on windows. */
- dirs.push_back (lilypond_datadir + "/fonts/otf");
+ /* fontconfig conf files */
+ vector<string> confs;
+
+ /* LilyPond local fontconfig conf file 00
+ This file is loaded *before* fontconfig's default conf. */
+ confs.push_back (lilypond_datadir + "/fonts/00-lilypond-fonts.conf");
+
+ /* fontconfig's default conf file */
+ void *default_conf = FcConfigFilename (NULL);
+ confs.push_back (static_cast<char*>(default_conf));
+ FcStrFree(static_cast<FcChar8*>(default_conf));
+
+ /* LilyPond local fontconfig conf file 99
+ This file is loaded *after* fontconfig's default conf. */
+ confs.push_back (lilypond_datadir + "/fonts/99-lilypond-fonts.conf");
- for (vsize i = 0; i < dirs.size (); i++)
+ /* Load fontconfig conf files */
+ for (vector<string>::const_iterator it = confs.begin ();
+ it != confs.end ();
+ it++)
{
- string dir = dirs[i];
- if (!FcConfigAppFontAddDir (font_config_global, (FcChar8 *)dir.c_str ()))
- error (_f ("failed adding font directory: %s", dir.c_str ()));
+ if (!FcConfigParseAndLoad (font_config_global,
+ (FcChar8 *)it->c_str (),
+ FcFalse))
+ error (_f ("failed to add fontconfig configuration file `%s'",
+ it->c_str ()));
else
- debug_output (_f ("Adding font directory: %s", dir.c_str ()));
+ debug_output (_f ("Adding fontconfig configuration file: %s",
+ it->c_str ()));
}
+ /* Extra trailing slash suddenly breaks fontconfig (fc-cache 2.5.0)
+ on windows. */
+ string dir (lilypond_datadir + "/fonts/otf");
+
+ if (!FcConfigAppFontAddDir (font_config_global, (FcChar8 *)dir.c_str ()))
+ error (_f ("failed adding font directory: %s", dir.c_str ()));
+ else
+ debug_output (_f ("Adding font directory: %s", dir.c_str ()));
+
debug_output (_ ("Building font database..."));
FcConfigBuildFonts (font_config_global);