X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-config.cc;h=8ad36fbbabadb8edfa9a0a3db2d0b0bce3d1a143;hb=25191e57fa34030e148d9b98478ce5690b8d385b;hp=54f04bee8ebc5e2c93988ce8f83ef0b3fcb5852a;hpb=1c846b2c2348b4e0ca4a3c2e8fb267047ba2d203;p=lilypond.git diff --git a/lily/font-config.cc b/lily/font-config.cc index 54f04bee8e..8ad36fbbab 100644 --- a/lily/font-config.cc +++ b/lily/font-config.cc @@ -30,41 +30,37 @@ #include "main.hh" #include "warn.hh" - FcConfig *font_config_global = 0; void init_fontconfig () { - if (be_verbose_global) - message (_ ("Initializing FontConfig...")); + debug_output (_ ("Initializing FontConfig...")); /* TODO: Find a way for Fontconfig to update its cache, if needed. */ font_config_global = FcInitLoadConfig (); - + vector dirs; /* Extra trailing slash suddenly breaks fontconfig (fc-cache 2.5.0) on windows. */ dirs.push_back (lilypond_datadir + "/fonts/otf"); - + for (vsize i = 0; i < dirs.size (); i++) { string dir = dirs[i]; if (!FcConfigAppFontAddDir (font_config_global, (FcChar8 *)dir.c_str ())) - error (_f ("failed adding font directory: %s", dir.c_str ())); - else if (be_verbose_global) - message (_f ("adding font directory: %s", dir.c_str ())); + error (_f ("failed adding font directory: %s", dir.c_str ())); + else + debug_output (_f ("Adding font directory: %s", dir.c_str ())); } - - if (be_verbose_global) - message (_ ("Building font database...")); + + debug_output (_ ("Building font database...")); FcConfigBuildFonts (font_config_global); FcConfigSetCurrent (font_config_global); - if (be_verbose_global) - message ("\n"); + debug_output ("\n"); }