- BOOST_FOREACH (shared_ptr<dcp::LoadFontNode> i, sc->load_font_nodes ()) {
- _fonts.push_back (shared_ptr<Font> (new Font (i->id)));
+ sc->fix_empty_font_ids ();
+
+ auto font_data = sc->font_data();
+ for (auto node: sc->load_font_nodes()) {
+ auto data = font_data.find(node->id);
+ if (data != font_data.end()) {
+ only_text()->add_font(make_shared<Font>(node->id, data->second));
+ } else {
+ only_text()->add_font(make_shared<Font>(node->id));
+ }