source file of the GNU LilyPond music typesetter
- (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "config.hh"
#include <sys/stat.h>
#include "file-path.hh"
+#include "international.hh"
#include "main.hh"
#include "warn.hh"
if (!is_file ((char*)cache_file))
message (_f ("Rebuilding FontConfig cache %s. this may take a while...", cache_file));
- FcConfigBuildFonts (font_config_global);
- FcConfigSetCurrent (font_config_global);
-
- Array<String> dirs;
+ vector<string> dirs;
- dirs.push (prefix_directory + "/fonts/otf/");
- dirs.push (prefix_directory + "/fonts/type1/");
+ dirs.push_back (prefix_directory + "/fonts/otf/");
+ dirs.push_back (prefix_directory + "/fonts/type1/");
- for (int i = 0; i < dirs.size (); i++)
+ for (vsize 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 ()));
+ string dir = dirs[i];
+ if (!FcConfigAppFontAddDir (font_config_global, (FcChar8 *)dir.c_str ()))
+ error (_f ("adding font directory: %s", dir.c_str ()));
else if (be_verbose_global)
- message (_f ("adding font directory: %s", dir.to_str0 ()));
+ message (_f ("adding font directory: %s", dir.c_str ()));
}
- font_config_global = FcConfigGetCurrent ();
-
+ FcConfigBuildFonts (font_config_global);
+ FcConfigSetCurrent (font_config_global);
if (be_verbose_global)
progress_indication ("\n");