resolve merge

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

diff --git a/lily/font-config.cc b/lily/font-config.cc
index 7737068c2eb1c55f215db09d79cf71d782162261..54f04bee8ebc5e2c93988ce8f83ef0b3fcb5852a 100644 (file)
--- a/lily/font-config.cc
+++ b/lily/font-config.cc
@@ -1,9 +1,20 @@
 /*
-  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--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2005--2009 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"
@@ -28,28 +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 ();
-  FcChar8 *cache_file = FcConfigGetCache (font_config_global);
-
-#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;
 
   /* 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++)
     {
@@ -61,21 +58,14 @@ init_fontconfig ()
     }
   
   if (be_verbose_global)
-    message (_ ("Building font database."));
+    message (_ ("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);
-    }
-  
 }
 
 #else