X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-config.cc;h=11cfed0b403cfc25bc993e2eeae967e102f0808e;hb=1617b2130ae3b3eba29ea925ecac3c5dda52b98c;hp=46a38b9048649d7633df349a28b195d459612fb2;hpb=2c22efe5a46a37065b10c3f51c5d7db00d07d318;p=lilypond.git

diff --git a/lily/font-config.cc b/lily/font-config.cc
index 46a38b9048..11cfed0b40 100644
--- a/lily/font-config.cc
+++ b/lily/font-config.cc
@@ -1,18 +1,32 @@
 /*
-  font-config.cc -- implement FontConfig related functions
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2005--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2005 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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "config.hh"
 
 #if HAVE_FONTCONFIG
 
+#include <cstdio>
 #include <fontconfig/fontconfig.h>
 #include <sys/stat.h>
+
 #include "file-path.hh"
+#include "international.hh"
 #include "main.hh"
 #include "warn.hh"
 
@@ -21,38 +35,33 @@ FcConfig *font_config_global = 0;
 void
 init_fontconfig ()
 {
-  if (be_verbose_global)
-    message (_ ("Initializing FontConfig..."));
+  debug_output (_ ("Initializing FontConfig..."));
 
-  if (!FcInit ())
-    error (_ ("initializing FontConfig failed"));
+  /* TODO: Find a way for Fontconfig to update its cache, if needed. */
+  font_config_global = FcInitLoadConfig ();
 
+  vector<string> dirs;
 
-  font_config_global = FcConfigGetCurrent ();
-  Array<String> dirs;
-  struct stat statbuf;
-  String builddir = prefix_directory + "/mf/out/";
+  /* Extra trailing slash suddenly breaks fontconfig (fc-cache 2.5.0)
+     on windows.  */
+  dirs.push_back (lilypond_datadir + "/fonts/otf");
 
-  if (stat (builddir.to_str0 (), &statbuf) == 0)
-    dirs.push (builddir.to_str0 ());
-  else
+  for (vsize i = 0; i < dirs.size (); i++)
     {
-      dirs.push (prefix_directory + "/fonts/otf/");
-      dirs.push (prefix_directory + "/fonts/type1/");
-      dirs.push (prefix_directory + "/fonts/svg/");
+      string dir = dirs[i];
+      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 ()));
     }
 
-  for (int i = 0; i < dirs.size (); i++)
-    {
-      String dir = dirs[i];
-      if (!FcConfigAppFontAddDir (font_config_global, (FcChar8 *)dir.to_str0 ()))
-	error (_f ("adding font directory: %s", dir.to_str0 ()));
-      else if (be_verbose_global)
-	message (_f ("adding font directory: %s", dir.to_str0 ()));
-    }
+  debug_output (_ ("Building font database..."));
+
+  FcConfigBuildFonts (font_config_global);
+  FcConfigSetCurrent (font_config_global);
+
+  debug_output ("\n");
 
-  if (be_verbose_global)
-    progress_indication ("\n");
 }
 
 #else