Run grand-replace (issue 3765)

[lilypond.git] / lily / font-config.cc

diff --git a/lily/font-config.cc b/lily/font-config.cc
index 65ec1b003672193f0c2014d948e24815b0a48b45..11cfed0b403cfc25bc993e2eeae967e102f0808e 100644 (file)
--- 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--2010 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,15 +30,14 @@
 #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;
@@ -46,24 +45,22 @@ init_fontconfig ()
   /* 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++)
     {
       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."));
 
-  FcInitBringUptoDate ();
+  debug_output (_ ("Building font database..."));
+
+  FcConfigBuildFonts (font_config_global);
+  FcConfigSetCurrent (font_config_global);
 
-  if (be_verbose_global)
-    message ("\n");
+  debug_output ("\n");
 
 }