source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
/*
FIXME: should use symbol for #'style.
*/
-MAKE_SCHEME_CALLBACK(Clef,before_line_breaking,1);
+MAKE_SCHEME_CALLBACK (Clef,before_line_breaking,1);
SCM
Clef::before_line_breaking (SCM smob)
{
- Item * s = dynamic_cast<Item*> (unsmob_element (smob));
+ Item * s = dynamic_cast<Item*> (unsmob_grob (smob));
- SCM glyph = s->get_grob_property ("glyph");
+ SCM glyph = s->get_grob_property ("glyph-name");
if (gh_string_p (glyph))
{
String str = ly_scm2string (glyph);
- if (to_boolean (s->get_grob_property ("non-default")) &&
- s->break_status_dir() != RIGHT &&
- to_boolean (s->get_grob_property ("full-size-change")))
+ if (to_boolean (s->get_grob_property ("non-default"))
+ && s->break_status_dir () != RIGHT
+ && !to_boolean (s->get_grob_property ("full-size-change")))
{
str += "_change";
- s->set_grob_property ("glyph", ly_str02scm (str.ch_C()));
+ s->set_grob_property ("glyph-name", ly_str02scm (str.ch_C ()));
}
}
else
me->set_interface (ly_symbol2scm ("clef-interface"));
}
-MAKE_SCHEME_CALLBACK(Clef,brew_molecule,1)
+MAKE_SCHEME_CALLBACK (Clef,brew_molecule,1)
SCM
Clef::brew_molecule (SCM smob)
{
- Grob * sc = unsmob_element (smob);
- SCM glyph = sc->get_grob_property ("glyph");
+ Grob * sc = unsmob_grob (smob);
+ SCM glyph = sc->get_grob_property ("glyph-name");
if (gh_string_p (glyph))
{
return Font_interface::get_default_font (sc)->find_by_name (String (ly_scm2string (glyph))).smobbed_copy ();