X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-config.cc;h=11cfed0b403cfc25bc993e2eeae967e102f0808e;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=b9ba8b41a3cfc9714dd18d3b0f2a141d62171d1d;hpb=2a6f7d1f45438eae0b46636d43da07b36db53273;p=lilypond.git diff --git a/lily/font-config.cc b/lily/font-config.cc index b9ba8b41a3..11cfed0b40 100644 --- a/lily/font-config.cc +++ b/lily/font-config.cc @@ -1,56 +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--2014 Han-Wen Nienhuys - (c) 2005 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 + #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) - message (_ ("Initializing FontConfig...")); - - if (!FcInit ()) - error (_ ("initializing FontConfig")); - - FcConfig *fcc = FcConfigGetCurrent (); - Array dirs; - struct stat statbuf; - String builddir = prefix_directory + "/mf/out/"; - - if (stat (builddir.to_str0 (), &statbuf) == 0) - dirs.push (builddir.to_str0 ()); - else - { - dirs.push (prefix_directory + "/fonts/otf/"); - dirs.push (prefix_directory + "/fonts/type1/"); - dirs.push (prefix_directory + "/fonts/cff/"); - dirs.push (prefix_directory + "/fonts/svg/"); - } - - for (int i = 0; i < dirs.size (); i++) + debug_output (_ ("Initializing FontConfig...")); + + /* TODO: Find a way for Fontconfig to update its cache, if needed. */ + font_config_global = FcInitLoadConfig (); + + vector dirs; + + /* 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 (fcc, (FcChar8 *)dir.to_str0 ())) - error (_f ("adding lilypond directory: %s", dir.to_str0 ())); - else if (be_verbose_global) - message (_f ("adding font directory: %s", dir.to_str0 ())); + 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_indication ("\n"); + debug_output (_ ("Building font database...")); + + FcConfigBuildFonts (font_config_global); + FcConfigSetCurrent (font_config_global); + + debug_output ("\n"); + } #else @@ -59,4 +70,5 @@ void init_fontconfig () { } + #endif