- /* Extra trailing slash suddenly breaks fontconfig (fc-cache 2.5.0)
- on windows. */
- dirs.push_back (lilypond_datadir + "/fonts/otf");
- dirs.push_back (lilypond_datadir + "/fonts/type1");
-
- for (vsize i = 0; i < dirs.size (); i++)
+ /* 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");
+
+ /* Load fontconfig conf files */
+ for (vector<string>::const_iterator it = confs.begin ();
+ it != confs.end ();
+ it++)