Doc: small addition to CG "Getting the source code"

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

diff --git a/lily/font-config.cc b/lily/font-config.cc
index 65ec1b003672193f0c2014d948e24815b0a48b45..b66dc1f40b24c5b2d7843af9fb928c9cb68bb4c7 100644 (file)
--- a/lily/font-config.cc
+++ b/lily/font-config.cc
@@ -39,14 +39,14 @@ init_fontconfig ()
   if (be_verbose_global)
     message (_ ("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");
-  dirs.push_back (lilypond_datadir + "/fonts/type1");
   
   for (vsize i = 0; i < dirs.size (); i++)
     {
@@ -58,9 +58,10 @@ init_fontconfig ()
     }
   
   if (be_verbose_global)
-    message (_ ("Building font database."));
+    message (_ ("Building font database..."));
 
-  FcInitBringUptoDate ();
+  FcConfigBuildFonts (font_config_global);
+  FcConfigSetCurrent (font_config_global);
 
   if (be_verbose_global)
     message ("\n");