(c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
-#include "all-font-metrics.hh"
-#include "font-metric.hh"
#include "font-interface.hh"
-#include "grob.hh"
-#include "paper-def.hh"
-#include "warn.hh"
+#include "all-font-metrics.hh"
+#include "output-def.hh"
+#include "warn.hh"
+#include "grob.hh"
/* todo: split up this func, reuse in text_item? */
Font_metric *
Font_metric *fm = unsmob_metrics (me->get_property ("font"));
if (!fm)
{
- fm = select_font (me->get_paper (), font_alist_chain (me));
+ SCM chain = music_font_alist_chain (me);
+
+ fm = select_font (me->get_layout (), chain);
me->set_property ("font", fm->self_scm ());
}
+
return fm;
}
return Font_interface::get_default_font (gr)->self_scm ();
}
+
+SCM
+Font_interface::music_font_alist_chain (Grob *g)
+{
+ SCM defaults
+ = g->get_layout ()->lookup_variable (ly_symbol2scm ("font-defaults"));
+ return g->get_property_alist_chain (defaults);
+}
+
SCM
-Font_interface::font_alist_chain (Grob *g)
+Font_interface::text_font_alist_chain (Grob *g)
{
- SCM defaults = g->get_paper ()->lookup_variable (ly_symbol2scm ("font-defaults"));
+ SCM defaults
+ = g->get_layout ()->lookup_variable (ly_symbol2scm ("text-font-defaults"));
return g->get_property_alist_chain (defaults);
}
"Any symbol that is typeset through fixed sets of glyphs, "
" (ie. fonts)",
"font-magnification font font-series font-shape "
- "font-family font-name font-size");
+ "font-family font-encoding font-name font-size");