#include "debug.hh"
#include "script.hh"
-#include "lookup.hh"
+#include "font-interface.hh"
#include "side-position-interface.hh"
#include "paper-def.hh"
#include "item.hh"
+#include "molecule.hh"
+#include "lookup.hh"
Molecule
Script::get_molecule(Score_element * me, Direction d)
SCM key = gh_car (s);
if (key == ly_symbol2scm ("feta"))
{
- return me->lookup_l ()->afm_find ("scripts-" +
+ return Font_interface::get_default_font (me)->find_by_name ("scripts-" +
ly_scm2string (index_cell (gh_cdr (s), d)));
}
else if (key == ly_symbol2scm ("accordion"))
{
- return me->lookup_l ()->accordion (gh_cdr (s), me->paper_l()->get_var("staffspace"));
+ return Lookup::accordion (gh_cdr (s), 1.0, Font_interface::get_default_font (me));
}
else
assert (false);
return Molecule ();
}
-MAKE_SCHEME_CALLBACK(Script,after_line_breaking);
+MAKE_SCHEME_CALLBACK(Script,after_line_breaking,1);
SCM
Script::after_line_breaking (SCM smob)
{
return SCM_UNSPECIFIED;
}
-MAKE_SCHEME_CALLBACK(Script,brew_molecule);
+MAKE_SCHEME_CALLBACK(Script,brew_molecule,1);
SCM
Script::brew_molecule (SCM smob)