X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur.cc;h=d82633da18b86b6838380e619bfffa9321ee503f;hb=27778e71840f517d1ed4ab3529051809ef4cbd74;hp=32149e8412c8be7f71c43f9168b8379fd4eb342e;hpb=4bb29573149a0ffa1f881c5e38a0fe68e9e76b67;p=lilypond.git diff --git a/lily/slur.cc b/lily/slur.cc index 32149e8412..d82633da18 100644 --- a/lily/slur.cc +++ b/lily/slur.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1996--2011 Han-Wen Nienhuys + Copyright (C) 1996--2012 Han-Wen Nienhuys Jan Nieuwenhuizen LilyPond is free software: you can redistribute it and/or modify @@ -32,6 +32,7 @@ #include "note-column.hh" #include "output-def.hh" #include "spanner.hh" +#include "skyline-pair.hh" #include "staff-symbol-referencer.hh" #include "stem.hh" #include "text-interface.hh" @@ -70,15 +71,26 @@ MAKE_SCHEME_CALLBACK (Slur, pure_height, 3); SCM Slur::pure_height (SCM smob, SCM start_scm, SCM end_scm) { + /* + Note that this estimation uses a rote add-on of 0.5 to the + highest encompassed note-head for a slur estimate. This is, + in most cases, shorter than the actual slur. + + Ways to improve this could include: + -- adding extra height for scripts that avoid slurs on the inside + -- adding extra height for the "bulge" in a slur above a note head + */ Grob *me = unsmob_grob (smob); int start = scm_to_int (start_scm); int end = scm_to_int (end_scm); - Real height = robust_scm2double (me->get_property ("height-limit"), 2.0); + Direction dir = get_grob_direction (me); extract_grob_set (me, "note-columns", encompasses); Interval ret; + ret.set_empty (); Grob *parent = me->get_parent (Y_AXIS); + Drul_array extremal_heights (infinity_f, -infinity_f); if (common_refpoint_of_array (encompasses, me, Y_AXIS) != parent) /* this could happen if, for example, we are a cross-staff slur. in this case, we want to be ignored */ @@ -88,13 +100,35 @@ Slur::pure_height (SCM smob, SCM start_scm, SCM end_scm) { Interval d = encompasses[i]->pure_height (parent, start, end); if (!d.is_empty ()) - ret.unite (d); + { + Direction downup = DOWN; + do + ret.add_point (d[dir]); + while (flip (&downup) != DOWN); + + if (extremal_heights[LEFT] == infinity_f) + extremal_heights[LEFT] = d[dir]; + extremal_heights[RIGHT] = d[dir]; + } } - // The +0.5 comes from the fact that we try to place a slur - // 0.5 staff spaces from the note-head. - // (see Slur_score_state.get_base_attachments ()) - ret.widen (height * 0.5 + 0.5); + if (ret.is_empty ()) + return ly_interval2scm (Interval ()); + + Interval extremal_span; + extremal_span.set_empty (); + Direction d = LEFT; + do + extremal_span.add_point (extremal_heights[d]); + while (flip (&d) != LEFT); + ret[-dir] = minmax (dir, extremal_span[-dir], ret[-dir]); + + /* + The +0.5 comes from the fact that we try to place a slur + 0.5 staff spaces from the note-head. + (see Slur_score_state.get_base_attachments ()) + */ + ret += 0.5 * dir; return ly_interval2scm (ret); } @@ -270,6 +304,23 @@ Slur::outside_slur_callback (SCM grob, SCM offset_scm) Interval yext = robust_relative_extent (script, cy, Y_AXIS); Interval xext = robust_relative_extent (script, cx, X_AXIS); + Interval slur_wid (curve.control_[0][X_AXIS], curve.control_[3][X_AXIS]); + + /* + cannot use is_empty because some 0-extent scripts + come up with TabStaffs. + */ + if (xext.length () <= 0 || yext.length () <= 0) + return offset_scm; + + bool contains = false; + Direction d = LEFT; + do + contains |= slur_wid.contains (xext[d]); + while (flip (&d) != LEFT); + + if (!contains) + return offset_scm; Real offset = robust_scm2double (offset_scm, 0); yext.translate (offset); @@ -279,45 +330,73 @@ Slur::outside_slur_callback (SCM grob, SCM offset_scm) 0.0); yext.widen (slur_padding); - const Real EPS = 1e-3; - Interval bezext (curve.control_[0][X_AXIS], curve.control_[3][X_AXIS]); - bool consider[] = {false, false, false}; - Real ys[] = {0, 0, 0}; + Interval exts[] = {xext, yext}; bool do_shift = false; - - for (int d = LEFT, k = 0; d <= RIGHT; d++, k++) + Real EPS = 1.0e-5; + if (avoid == ly_symbol2scm ("outside")) { - Real x = xext.linear_combination ((Direction) d); - consider[k] = bezext.contains (x); - - if (consider[k]) + Direction d = LEFT; + do { - ys[k] - = (fabs (bezext[LEFT] - x) < EPS) - ? curve.control_[0][Y_AXIS] - : ((fabs (bezext[RIGHT] - x) < EPS) - ? curve.control_[3][Y_AXIS] - : curve.get_other_coordinate (X_AXIS, x)); - - /* Request shift if slur is contained script's Y, or if - script is inside slur and avoid == outside. */ - if (yext.contains (ys[k]) - || (dir * ys[k] > dir * yext[-dir] && avoid == ly_symbol2scm ("outside"))) - do_shift = true; + Real x = minmax (-d, xext[d], curve.control_[d == LEFT ? 0 : 3][X_AXIS] + -d * EPS); + Real y = curve.get_other_coordinate (X_AXIS, x); + do_shift = y == minmax (dir, yext[-dir], y); + if (do_shift) + break; } + while (flip (&d) != LEFT); } - - Real avoidance_offset = 0.0; - if (do_shift) + else { - for (int d = LEFT, k = 0; d <= RIGHT; d++, k++) - if (consider[k]) - avoidance_offset = dir * (max (dir * avoidance_offset, - dir * (ys[k] - yext[-dir] + dir * slur_padding))); + for (int a = X_AXIS; a < NO_AXES; a++) + { + Direction d = LEFT; + do + { + vector coords = curve.get_other_coordinates (Axis (a), exts[a][d]); + for (vsize i = 0; i < coords.size (); i++) + { + do_shift = exts[(a + 1) % NO_AXES].contains (coords[i]); + if (do_shift) + break; + } + if (do_shift) + break; + } + while (flip (&d) != LEFT); + if (do_shift) + break; + } } + + Real avoidance_offset = do_shift ? curve.minmax (X_AXIS, max (xext[LEFT], curve.control_[0][X_AXIS] + EPS), min (xext[RIGHT], curve.control_[3][X_AXIS] - EPS), dir) - yext[-dir] : 0.0; + return scm_from_double (offset + avoidance_offset); } +MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Slur, vertical_skylines, 1, 0, ""); +SCM +Slur::vertical_skylines (SCM smob) +{ + Grob *me = unsmob_grob (smob); + vector boxes; + + if (!me) + return Skyline_pair (boxes, 0.0, X_AXIS).smobbed_copy (); + + Bezier curve = Slur::get_curve (me); + vsize box_count = robust_scm2vsize (me->get_property ("skyline-quantizing"), 10); + for (vsize i = 0; i < box_count; i++) + { + Box b; + b.add_point (curve.curve_point (i * 1.0 / box_count)); + b.add_point (curve.curve_point ((i + 1) * 1.0 / box_count)); + boxes.push_back (b); + } + + return Skyline_pair (boxes, 0.0, X_AXIS).smobbed_copy (); +} + /* * Used by Slur_engraver:: and Phrasing_slur_engraver:: */ @@ -424,8 +503,6 @@ ADD_INTERFACE (Slur, "Demerit to apply when note heads collide with a slur.\n" "@item stem-encompass-penalty\n" "Demerit to apply when stems collide with a slur.\n" - "@item closeness-factor\n" - "Additional demerit used when scoring encompasses.\n" "@item edge-attraction-factor\n" "Factor used to calculate the demerit for distances" " between slur endpoints and their corresponding base" @@ -481,7 +558,7 @@ ADD_INTERFACE (Slur, /* properties */ "annotation " - "avoid-slur " /* UGH. */ + "avoid-slur " /* UGH. */ "control-points " "dash-definition " "details " @@ -493,8 +570,10 @@ ADD_INTERFACE (Slur, "inspect-index " "line-thickness " "note-columns " + "skyline-quantizing " "positions " "ratio " "thickness " + "vertical-skylines " );