X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fline-spanner.cc;h=5013e406dfa04e48475febd3b5518243a21f4e11;hb=a8172deda8ce6983c19b8217cd7b1879a8fcb653;hp=cbfe9dd306f6895cec23f74f3ad6a08fc0905473;hpb=4ecdbd7d70ca7441be4dddd15ac01cc255bc2a35;p=lilypond.git diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc index cbfe9dd306..5013e406df 100644 --- a/lily/line-spanner.cc +++ b/lily/line-spanner.cc @@ -8,8 +8,6 @@ #include "line-spanner.hh" -#include -using namespace std; #include "spanner.hh" #include "output-def.hh" @@ -97,7 +95,7 @@ Line_spanner::after_line_breaking (SCM g) /* Can't do suicide, since this mucks up finding the trend. */ - me->set_property ("print-function", SCM_EOL); + me->set_property ("transparent", SCM_BOOL_T); } return SCM_EOL; } @@ -285,8 +283,8 @@ Line_spanner::print (SCM smob) { Axis ax = (Axis)a; dxy[ax] - = + bound[RIGHT]->extent (common[X_AXIS], ax).center () - - bound[LEFT]->extent (common[X_AXIS], ax).center (); + = + robust_relative_extent (bound[RIGHT], common[X_AXIS], ax).center () + - robust_relative_extent (bound[LEFT], common[X_AXIS], ax).center (); my_off[ax] = me->relative_coordinate (common[a], ax); his_off[ax] = bound[LEFT]->relative_coordinate (common[a], ax);