From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Wed, 11 Jan 2006 17:05:12 +0000 (+0000)
Subject: (init_fontconfig): call FcConfigBuildFonts()
X-Git-Tag: release/2.7.28~17
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=902c4a6ab6af887ec2545b3541dab6d6a0e13a74;p=lilypond.git

(init_fontconfig): call FcConfigBuildFonts()
explicitly.
---

diff --git a/ChangeLog b/ChangeLog
index 8a59a23578..2255eaf9d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-01-11  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+	* lily/font-config.cc (init_fontconfig): call FcConfigBuildFonts()
+	explicitly.
+
 	* lily/font-config-scheme.cc (LY_DEFINE): also display font and
 	config dirs. Aids debugging. 
 	(display_config): also display config files.
diff --git a/lily/font-config.cc b/lily/font-config.cc
index c26a1242aa..1e39ecbffb 100644
--- a/lily/font-config.cc
+++ b/lily/font-config.cc
@@ -36,8 +36,6 @@ init_fontconfig ()
   if (!is_file ((char*)cache_file))
     message (_f ("Rebuilding FontConfig cache %s. this may take a while...", cache_file));
 			
-  FcConfigSetCurrent (font_config_global);
-  
   Array<String> dirs;
 
   dirs.push (prefix_directory + "/fonts/otf/");
@@ -52,6 +50,8 @@ init_fontconfig ()
 	message (_f ("adding font directory: %s", dir.to_str0 ()));
     }
 
+  FcConfigBuildFonts (font_config_global);
+  FcConfigSetCurrent (font_config_global);
   if (be_verbose_global)
     progress_indication ("\n");