X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-config.cc;h=63cb66fc3519967e5e4b238bb9f85a8758e1b5e8;hb=4a401ca1c60f428daa242dbdd102fdb3f327ebfb;hp=ad66c7870834fc8ffd9e5370bfc6263ede258188;hpb=e10092cbaddbbe8bf2a3668eb70ee4dafb54af8a;p=lilypond.git diff --git a/lily/font-config.cc b/lily/font-config.cc index ad66c78708..63cb66fc35 100644 --- a/lily/font-config.cc +++ b/lily/font-config.cc @@ -1,15 +1,27 @@ /* - 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 - (c) 2005--2006 Han-Wen Nienhuys + 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 . */ #include "config.hh" #if HAVE_FONTCONFIG +#include #include #include @@ -18,7 +30,6 @@ #include "main.hh" #include "warn.hh" - FcConfig *font_config_global = 0; void @@ -27,51 +38,33 @@ 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 (!cache_file) - { - programming_error ("global fontconfig cache_file not found"); - return; - } - - /* - This is a terrible kludge, but there is apparently no way for - FontConfig to signal whether it needs to rescan directories. - */ - if (!is_file ((char*)cache_file)) - message (_f ("Rebuilding FontConfig cache %s, this may take a while...", cache_file)); - vector dirs; - dirs.push_back (prefix_directory + "/fonts/otf/"); - dirs.push_back (prefix_directory + "/fonts/type1/"); - + /* Extra trailing slash suddenly breaks fontconfig (fc-cache 2.5.0) + on windows. */ + dirs.push_back (lilypond_datadir + "/fonts/otf"); + for (vsize i = 0; i < dirs.size (); i++) { string dir = dirs[i]; if (!FcConfigAppFontAddDir (font_config_global, (FcChar8 *)dir.c_str ())) - error (_f ("adding font directory: %s", 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 ())); + message (_f ("adding font directory: %s", dir.c_str ())); } - + if (be_verbose_global) - progress_indication ("Building font database.\n"); + message (_ ("Building font database...")); + FcConfigBuildFonts (font_config_global); FcConfigSetCurrent (font_config_global); + if (be_verbose_global) - progress_indication ("\n"); + message ("\n"); - if (!is_file ((char*)cache_file)) - { - /* inhibit future messages. */ - FILE *f = fopen ((char*)cache_file, "w"); - if (f) - fclose (f); - } - } #else