X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore-element.cc;h=fbd44eb4f4e7a4b65d36826d72edd829f82c6fac;hb=867530093ed5374d6e28d2c11a933f3b991c226e;hp=453b166e04bdbdcc6d06f84ccea7ab8e003d4963;hpb=2522fadff41b2b07313c4967a4f85c147fe9b9c4;p=lilypond.git diff --git a/lily/score-element.cc b/lily/score-element.cc index 453b166e04..fbd44eb4f4 100644 --- a/lily/score-element.cc +++ b/lily/score-element.cc @@ -202,8 +202,6 @@ Score_element::preset_extent (SCM element_smob, SCM scm_axis) { Real l = gh_scm2double (gh_car (ext)); Real r = gh_scm2double (gh_cdr (ext)); - l *= s->paper_l ()->get_var ("staffspace"); - r *= s->paper_l ()->get_var ("staffspace"); return ly_interval2scm (Interval (l, r)); } @@ -579,11 +577,10 @@ Score_element::extent (Score_element * refp, Axis a) const /* signs ? */ - Real s = paper_l ()->get_var ("staffspace"); if (gh_pair_p (extra)) { - ext[BIGGER] += s * gh_scm2double (gh_cdr (extra)); - ext[SMALLER] += s * gh_scm2double (gh_car (extra)); + ext[BIGGER] += gh_scm2double (gh_cdr (extra)); + ext[SMALLER] += gh_scm2double (gh_car (extra)); } extra = get_elt_property (a == X_AXIS @@ -591,8 +588,8 @@ Score_element::extent (Score_element * refp, Axis a) const : "minimum-extent-Y"); if (gh_pair_p (extra)) { - ext.unite (Interval (s * gh_scm2double (gh_car (extra)), - s * gh_scm2double (gh_cdr (extra)))); + ext.unite (Interval (gh_scm2double (gh_car (extra)), + gh_scm2double (gh_cdr (extra)))); } ext.translate (x);