source file of the GNU LilyPond music typesetter
- (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "font-interface.hh"
#include "side-position-interface.hh"
#include "output-def.hh"
-#include "item.hh"
-#include "stencil.hh"
#include "lookup.hh"
#include "stem.hh"
#include "note-column.hh"
Script_interface::get_stencil (Grob *me, Direction d)
{
SCM s = me->get_property ("script-stencil");
- assert (ly_c_pair_p (s));
+ assert (scm_is_pair (s));
- SCM key = ly_car (s);
+ SCM key = scm_car (s);
if (key == ly_symbol2scm ("feta"))
{
- SCM name_entry = ly_cdr (s);
- SCM str = ((ly_c_pair_p (name_entry)) ? index_get_cell (name_entry, d)
+ SCM name_entry = scm_cdr (s);
+ SCM str = ((scm_is_pair (name_entry)) ? index_get_cell (name_entry, d)
: name_entry);
return Font_interface::get_default_font (me)
- ->find_by_name ("scripts-" + ly_scm2string (str));
+ ->find_by_name ("scripts." + ly_scm2string (str));
}
else if (key == ly_symbol2scm ("accordion"))
- return Lookup::accordion (ly_cdr (s), 1.0,
+ return Lookup::accordion (scm_cdr (s), 1.0,
Font_interface::get_default_font (me));
else
assert (false);
SCM
Script_interface::print (SCM smob)
{
- Grob *me= unsmob_grob (smob);
+ Grob *me = unsmob_grob (smob);
Direction dir = Side_position_interface::get_direction (me);
if (!dir)
*/
ADD_INTERFACE (Script_interface, "script-interface",
"An object that is put above or below a note",
- "add-stem-support slur script-priority script-stencil inside-slur");
+ "add-stem-support slur-padding slur script-priority script-stencil inside-slur");