X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Ffont-config.cc;h=641192b12c7566d5bdd3056291a551ff22b3779f;hb=a5cf6dd30939342f26ce626476527c76bafa493b;hp=cc116caefa1722149fae629a9e890ad4c22e63e5;hpb=588ed028a5d4e58b0b2441333965e9cedb845a63;p=lilypond.git

diff --git a/lily/font-config.cc b/lily/font-config.cc
index cc116caefa..641192b12c 100644
--- a/lily/font-config.cc
+++ b/lily/font-config.cc
@@ -1,47 +1,67 @@
 /*
-  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--2012 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"
 
-#ifdef HAVE_FONTCONFIG
+#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"
 
+FcConfig *font_config_global = 0;
+
 void
 init_fontconfig ()
 {
-  if (be_verbose_global)
-    progress (_("Initializing FontConfig ..."));
-  
-  if (!FcInit ())
-    error (_ ("FontConfig failed to initialize"));
+  debug_output (_ ("Initializing FontConfig..."));
+
+  /* TODO: Find a way for Fontconfig to update its cache, if needed. */
+  font_config_global = FcInitLoadConfig ();
 
-  FcConfig *fcc = FcConfigGetCurrent ();
+  vector<string> dirs;
 
-  Array<String> dirs;
-  dirs.push (prefix_directory + "/fonts/otf/");
-  dirs.push (prefix_directory + "/mf/out/");
-  dirs.push (prefix_directory + "/fonts/type1/");
-  dirs.push (prefix_directory + "/fonts/cff/");
+  /* Extra trailing slash suddenly breaks fontconfig (fc-cache 2.5.0)
+     on windows.  */
+  dirs.push_back (lilypond_datadir + "/fonts/otf");
 
-  for (int i = 0; i < dirs.size (); i++)
+  for (vsize i = 0; i < dirs.size (); i++)
     {
-      String dir = dirs[i];
-      if (!FcConfigAppFontAddDir (fcc, (FcChar8 *)dir.to_str0 ()))
-	error (_f ("Failed to add lilypond directory %s", dir));
+      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 ()));
     }
 
-  if (be_verbose_global)
-    progress ("\n");
+  debug_output (_ ("Building font database..."));
+
+  FcConfigBuildFonts (font_config_global);
+  FcConfigSetCurrent (font_config_global);
+
+  debug_output ("\n");
+
 }
 
 #else
@@ -50,4 +70,5 @@ void
 init_fontconfig ()
 {
 }
+
 #endif