X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscript.cc;h=78fbff9db13ce8678631b6ea453822a993b1b0bf;hb=9f34e35c3cb97d2a1f0c7838590a574095fbee2e;hp=c680f73d9306061e5b64929eaa4c0bf71a765156;hpb=07a5ed85c189a97d04c550679826dfc5eca2eb18;p=lilypond.git diff --git a/lily/script.cc b/lily/script.cc index c680f73d93..78fbff9db1 100644 --- a/lily/script.cc +++ b/lily/script.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ @@ -44,8 +44,8 @@ Script::after_line_breaking (SCM smob) { Grob * me = unsmob_grob (smob); - Direction d = Side_position::get_direction (me); - Side_position::set_direction (me,d); + Direction d = Side_position_interface::get_direction (me); + Side_position_interface::set_direction (me,d); return SCM_UNSPECIFIED; } @@ -57,12 +57,18 @@ Script::brew_molecule (SCM smob) { Grob *me= unsmob_grob (smob); #if 0 - Direction dir = DOWN; + SCM d = me->get_grob_property ("direction"); if (isdir_b (d)) dir = to_dir (d); #endif - Direction dir = Side_position::get_direction(me); + Direction dir = Side_position_interface::get_direction(me); + if (!dir) + { + programming_error ("Script direction not known, but molecule wanted."); + dir= DOWN; + } + return get_molecule (me, dir).smobbed_copy(); }