#include "dcpomatic_assert.h"
#include "font_config.h"
#include <fontconfig/fontconfig.h>
+#include <boost/filesystem.hpp>
#include <boost/optional.hpp>
}
+optional<boost::filesystem::path>
+FontConfig::system_font_with_name(string name)
+{
+ optional<boost::filesystem::path> path;
+
+ auto pattern = FcNameParse(reinterpret_cast<FcChar8 const*>(name.c_str()));
+ auto object_set = FcObjectSetBuild(FC_FILE, nullptr);
+ auto font_set = FcFontList(_config, pattern, object_set);
+ if (font_set) {
+ for (int i = 0; i < font_set->nfont; ++i) {
+ auto font = font_set->fonts[i];
+ FcChar8* file;
+ if (FcPatternGetString(font, FC_FILE, 0, &file) == FcResultMatch) {
+ path = boost::filesystem::path(reinterpret_cast<char*>(file));
+ break;
+ }
+ }
+ FcFontSetDestroy(font_set);
+ }
+
+ FcObjectSetDestroy(object_set);
+ FcPatternDestroy(pattern);
+
+ return path;
+}
+
+
FontConfig *
FontConfig::instance()
{
static FontConfig* instance();
std::string make_font_available(boost::filesystem::path font_file);
+ boost::optional<boost::filesystem::path> system_font_with_name(std::string name);
private:
FontConfig();
*/
-#include "string_text_file_content.h"
-#include "util.h"
-#include "string_text_file.h"
#include "film.h"
#include "font.h"
+#include "font_config.h"
+#include "string_text_file.h"
+#include "string_text_file_content.h"
#include "text_content.h"
+#include "util.h"
#include <dcp/raw_convert.h>
+#include <fontconfig/fontconfig.h>
#include <libxml++/libxml++.h>
#include <iostream>
}
for (auto name: names) {
- /* Make a font for each family name that somebody might later
- * ask about.
- */
- only_text()->add_font(make_shared<Font>(name));
+ auto path = FontConfig::instance()->system_font_with_name(name);
+ if (path) {
+ only_text()->add_font(make_shared<Font>(name, *path));
+ } else {
+ only_text()->add_font(make_shared<Font>(name));
+ }
}
boost::mutex::scoped_lock lm (_mutex);