X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-config.cc;h=74e591254f4a96a820984bf50b5c56c5b37418e2;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=a7acda7cbad5b282e7acbcbe846d64fce07dfc00;hpb=f2f6fed22cd81850c4e942334f9f43156457c0cc;p=lilypond.git

diff --git a/lily/font-config.cc b/lily/font-config.cc
index a7acda7cba..74e591254f 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--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2005--2015 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,63 +30,66 @@
 #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..."));
 
-  font_config_global = FcInitLoadConfig ();
-  FcChar8 *cache_file = FcConfigGetCache (font_config_global);
+  /* TODO: Find a way for Fontconfig to update its cache, if needed. */
+  FcInitLoadConfig ();
 
-#if 0
-  // always returns 0 for FC 2.4
-  if (!cache_file)
-    programming_error ("Cannot find file for FontConfig cache.");
-#endif
-  /*
-    This is a terrible kludge, but there is apparently no way for
-    FontConfig to signal whether it needs to rescan directories.
-   */ 
-  if (cache_file
-      && !is_file ((char const *)cache_file))
-    message (_f ("Rebuilding FontConfig cache %s, this may take a while...", cache_file));
-			
-  vector<string> dirs;
+  /* Create an empty configuration */
+  font_config_global = FcConfigCreate ();
 
-  /* 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++)
+  /* fontconfig conf files */
+  vector<string> confs;
+
+  /* LilyPond local fontconfig conf file 00
+     This file is loaded *before* fontconfig's default conf. */
+  confs.push_back (lilypond_datadir + "/fonts/00-lilypond-fonts.conf");
+
+  /* fontconfig's default conf file */
+  void *default_conf = FcConfigFilename (NULL);
+  confs.push_back (static_cast<char*>(default_conf));
+  FcStrFree(static_cast<FcChar8*>(default_conf));
+
+  /* LilyPond local fontconfig conf file 99
+     This file is loaded *after* fontconfig's default conf. */
+  confs.push_back (lilypond_datadir + "/fonts/99-lilypond-fonts.conf");
+
+  /* Load fontconfig conf files */
+  for (vector<string>::const_iterator it = confs.begin ();
+       it != confs.end ();
+       it++)
     {
-      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 ()));
+      if (!FcConfigParseAndLoad (font_config_global,
+                                 (FcChar8 *)it->c_str (),
+                                 FcFalse))
+        error (_f ("failed to add fontconfig configuration file `%s'",
+                   it->c_str ()));
+      else
+        debug_output (_f ("Adding fontconfig configuration file: %s",
+                          it->c_str ()));
     }
-  
-  if (be_verbose_global)
-    message (_ ("Building font database."));
+
+  /* Extra trailing slash suddenly breaks fontconfig (fc-cache 2.5.0)
+     on windows.  */
+  string dir (lilypond_datadir + "/fonts/otf");
+
+  if (!FcConfigAppFontAddDir (font_config_global, (FcChar8 *)dir.c_str ()))
+    error (_f ("failed adding font directory: %s", dir.c_str ()));
+  else
+    debug_output (_f ("Adding font directory: %s", dir.c_str ()));
+
+  debug_output (_ ("Building font database..."));
+
   FcConfigBuildFonts (font_config_global);
   FcConfigSetCurrent (font_config_global);
-  if (be_verbose_global)
-    message ("\n");
 
-  if (cache_file
-      && !is_file ((char*)cache_file))
-    {
-      /* inhibit future messages. */
-      FILE *f = fopen ((char*)cache_file, "w");
-      if (f)
-	fclose (f);
-    }
-  
+  debug_output ("\n");
+
 }
 
 #else