X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-config.cc;h=11cfed0b403cfc25bc993e2eeae967e102f0808e;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=54f04bee8ebc5e2c93988ce8f83ef0b3fcb5852a;hpb=55ac733b69643a6bc6a83b706c65cb56efd388ef;p=lilypond.git

diff --git a/lily/font-config.cc b/lily/font-config.cc
index 54f04bee8e..11cfed0b40 100644
--- a/lily/font-config.cc
+++ b/lily/font-config.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2005--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -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<string> 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");
 
 }