From: fred Date: Wed, 27 Mar 2002 00:34:04 +0000 (+0000) Subject: lilypond-1.3.114 X-Git-Tag: release/1.5.59~1069 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ad6f99d3fa8effe946ed01b84a32be828ed89974;p=lilypond.git lilypond-1.3.114 --- diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc index 60fbcd8a69..b1d3923d3f 100644 --- a/lily/side-position-interface.cc +++ b/lily/side-position-interface.cc @@ -27,10 +27,10 @@ Direction Side_position::get_direction (Grob*me) { SCM d = me->get_grob_property ("direction"); - if (isdir_b (d)) - return to_dir (d) ? to_dir (d) : DOWN; + if (isdir_b (d) && to_dir (d)) + return to_dir (d); - Direction relative_dir = UP; + Direction relative_dir = Direction (1); SCM reldir = me->get_grob_property ("side-relative-direction"); // should use a lambda. if (isdir_b (reldir)) { diff --git a/scm/element-descriptions.scm b/scm/element-descriptions.scm index 15e9b9ff67..af2869cbff 100644 --- a/scm/element-descriptions.scm +++ b/scm/element-descriptions.scm @@ -377,6 +377,7 @@ (Script . ( (molecule-callback . ,Script::brew_molecule) (X-offset-callbacks . (,Side_position::centered_on_parent)) + (after-line-breaking-callback . ,Script::after_line_breaking) (meta . ,(element-description "Script" script-interface side-position-interface font-interface)) ))