X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur.cc;h=5f95e5d4d659203dbee12d58aa7d59c3aa69dd47;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=32149e8412c8be7f71c43f9168b8379fd4eb342e;hpb=f93e4199873c91ae32f0e84a610d14853dc379df;p=lilypond.git diff --git a/lily/slur.cc b/lily/slur.cc index 32149e8412..5f95e5d4d6 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--2015 Han-Wen Nienhuys Jan Nieuwenhuizen LilyPond is free software: you can redistribute it and/or modify @@ -31,6 +31,7 @@ #include "main.hh" // DEBUG_SLUR_SCORING #include "note-column.hh" #include "output-def.hh" +#include "skyline-pair.hh" #include "spanner.hh" #include "staff-symbol-referencer.hh" #include "stem.hh" @@ -39,13 +40,14 @@ #include "warn.hh" #include "slur-scoring.hh" #include "separation-item.hh" +#include "unpure-pure-container.hh" #include "international.hh" MAKE_SCHEME_CALLBACK (Slur, calc_direction, 1) SCM Slur::calc_direction (SCM smob) { - Grob *me = unsmob_grob (smob); + Grob *me = unsmob (smob); extract_grob_set (me, "note-columns", encompasses); if (encompasses.empty ()) @@ -70,15 +72,26 @@ MAKE_SCHEME_CALLBACK (Slur, pure_height, 3); SCM Slur::pure_height (SCM smob, SCM start_scm, SCM end_scm) { - Grob *me = unsmob_grob (smob); + /* + 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 (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 */ @@ -86,15 +99,33 @@ Slur::pure_height (SCM smob, SCM start_scm, SCM end_scm) for (vsize i = 0; i < encompasses.size (); i++) { - Interval d = encompasses[i]->pure_height (parent, start, end); + Interval d = encompasses[i]->pure_y_extent (parent, start, end); if (!d.is_empty ()) - ret.unite (d); + { + for (DOWN_and_UP (downup)) + ret.add_point (d[dir]); + + 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 (); + for (LEFT_and_RIGHT (d)) + extremal_span.add_point (extremal_heights[d]); + 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); } @@ -102,7 +133,7 @@ MAKE_SCHEME_CALLBACK (Slur, height, 1); SCM Slur::height (SCM smob) { - Grob *me = unsmob_grob (smob); + Grob *me = unsmob (smob); // FIXME uncached Stencil *m = me->get_stencil (); @@ -114,7 +145,7 @@ MAKE_SCHEME_CALLBACK (Slur, print, 1); SCM Slur::print (SCM smob) { - Grob *me = unsmob_grob (smob); + Grob *me = unsmob (smob); extract_grob_set (me, "note-columns", encompasses); if (encompasses.empty ()) { @@ -148,7 +179,7 @@ Slur::print (SCM smob) properties = scm_cons (scm_acons (ly_symbol2scm ("font-size"), scm_from_int (-6), SCM_EOL), properties); - Stencil tm = *unsmob_stencil (Text_interface::interpret_markup + Stencil tm = *unsmob (Text_interface::interpret_markup (me->layout ()->self_scm (), properties, annotation)); a.add_at_edge (Y_AXIS, get_grob_direction (me), tm, 1.0); @@ -173,27 +204,23 @@ Slur::replace_breakable_encompass_objects (Grob *me) { Grob *g = extra_objects[i]; - if (Separation_item::has_interface (g)) + if (has_interface (g)) { extract_grob_set (g, "elements", breakables); for (vsize j = 0; j < breakables.size (); j++) /* if we encompass a separation-item that spans multiple staves, we filter out the grobs that don't belong to our staff */ if (me->common_refpoint (breakables[j], Y_AXIS) == me->get_parent (Y_AXIS) - && breakables[j]->get_property ("avoid-slur") == ly_symbol2scm ("inside")) + && scm_is_eq (breakables[j]->get_property ("avoid-slur"), + ly_symbol2scm ("inside"))) new_encompasses.push_back (breakables[j]); } else new_encompasses.push_back (g); } - SCM encompass_scm = me->get_object ("encompass-objects"); - if (Grob_array::unsmob (encompass_scm)) - { - vector &arr - = unsmob_grob_array (encompass_scm)->array_reference (); - arr = new_encompasses; - } + if (Grob_array *a = unsmob (me->get_object ("encompass-objects"))) + a->set_array (new_encompasses); } Bezier @@ -227,33 +254,34 @@ Slur::pure_outside_slur_callback (SCM grob, SCM start_scm, SCM end_scm, SCM offs { int start = robust_scm2int (start_scm, 0); int end = robust_scm2int (end_scm, 0); - Grob *script = unsmob_grob (grob); - Grob *slur = unsmob_grob (script->get_object ("slur")); + Grob *script = unsmob (grob); + Grob *slur = unsmob (script->get_object ("slur")); if (!slur) return offset_scm; SCM avoid = script->get_property ("avoid-slur"); - if (avoid != ly_symbol2scm ("outside") && avoid != ly_symbol2scm ("around")) + if (!scm_is_eq (avoid, ly_symbol2scm ("outside")) + && !scm_is_eq (avoid, ly_symbol2scm ("around"))) return offset_scm; Real offset = robust_scm2double (offset_scm, 0.0); Direction dir = get_grob_direction (script); - return scm_from_double (offset + dir * slur->pure_height (slur, start, end).length () / 4); + return scm_from_double (offset + dir * slur->pure_y_extent (slur, start, end).length () / 4); } MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Slur, outside_slur_callback, 2, 1, ""); SCM Slur::outside_slur_callback (SCM grob, SCM offset_scm) { - Grob *script = unsmob_grob (grob); - Grob *slur = unsmob_grob (script->get_object ("slur")); + Grob *script = unsmob (grob); + Grob *slur = unsmob (script->get_object ("slur")); if (!slur) return offset_scm; SCM avoid = script->get_property ("avoid-slur"); - if (avoid != ly_symbol2scm ("outside") - && avoid != ly_symbol2scm ("around")) + if (!scm_is_eq (avoid, ly_symbol2scm ("outside")) + && !scm_is_eq (avoid, ly_symbol2scm ("around"))) return offset_scm; Direction dir = get_grob_direction (script); @@ -270,6 +298,21 @@ 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; + for (LEFT_and_RIGHT (d)) + contains |= slur_wid.contains (xext[d]); + + if (!contains) + return offset_scm; Real offset = robust_scm2double (offset_scm, 0); yext.translate (offset); @@ -279,45 +322,69 @@ 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 (scm_is_eq (avoid, ly_symbol2scm ("outside"))) { - Real x = xext.linear_combination ((Direction) d); - consider[k] = bezext.contains (x); - - if (consider[k]) + for (LEFT_and_RIGHT (d)) { - 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; } } - - 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++) + { + for (LEFT_and_RIGHT (d)) + { + 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; + } + 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 (Slur, vertical_skylines, 1); +SCM +Slur::vertical_skylines (SCM smob) +{ + Grob *me = unsmob (smob); + vector boxes; + + if (!me) + return Skyline_pair (boxes, 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, X_AXIS).smobbed_copy (); +} + /* * Used by Slur_engraver:: and Phrasing_slur_engraver:: */ @@ -331,32 +398,37 @@ Slur::auxiliary_acknowledge_extra_object (Grob_info const &info, Grob *e = info.grob (); SCM avoid = e->get_property ("avoid-slur"); - if (Tie::has_interface (e) - || avoid == ly_symbol2scm ("inside")) + Grob *slur; + if (end_slurs.size () && !slurs.size ()) + slur = end_slurs[0]; + else + slur = slurs[0]; + + if (has_interface (e) + || scm_is_eq (avoid, ly_symbol2scm ("inside"))) { for (vsize i = slurs.size (); i--;) add_extra_encompass (slurs[i], e); for (vsize i = end_slurs.size (); i--;) add_extra_encompass (end_slurs[i], e); + if (slur) + e->set_object ("slur", slur->self_scm ()); } - else if (avoid == ly_symbol2scm ("outside") - || avoid == ly_symbol2scm ("around")) + else if (scm_is_eq (avoid, ly_symbol2scm ("outside")) + || scm_is_eq (avoid, ly_symbol2scm ("around"))) { - Grob *slur; - if (end_slurs.size () && !slurs.size ()) - slur = end_slurs[0]; - else - slur = slurs[0]; - if (slur) { - chain_offset_callback (e, outside_slur_callback_proc, Y_AXIS); + chain_offset_callback (e, + Unpure_pure_container::make_smob (outside_slur_callback_proc, + pure_outside_slur_callback_proc), + Y_AXIS); chain_callback (e, outside_slur_cross_staff_proc, ly_symbol2scm ("cross-staff")); e->set_object ("slur", slur->self_scm ()); } } - else if (avoid != ly_symbol2scm ("ignore")) - e->warning (_f ("Ignoring grob for slur: %s. avoid-slur not set?", + else if (!scm_is_eq (avoid, ly_symbol2scm ("ignore"))) + e->warning (_f ("Ignoring grob for slur: %s. avoid-slur not set?", e->name ().c_str ())); } @@ -370,11 +442,11 @@ MAKE_SCHEME_CALLBACK (Slur, outside_slur_cross_staff, 2) SCM Slur::outside_slur_cross_staff (SCM smob, SCM previous) { - if (previous == SCM_BOOL_T) + if (to_boolean (previous)) return previous; - Grob *me = unsmob_grob (smob); - Grob *slur = unsmob_grob (me->get_object ("slur")); + Grob *me = unsmob (smob); + Grob *slur = unsmob (me->get_object ("slur")); if (!slur) return SCM_BOOL_F; @@ -385,7 +457,7 @@ MAKE_SCHEME_CALLBACK (Slur, calc_cross_staff, 1) SCM Slur::calc_cross_staff (SCM smob) { - Grob *me = unsmob_grob (smob); + Grob *me = unsmob (smob); extract_grob_set (me, "note-columns", cols); extract_grob_set (me, "encompass-objects", extras); @@ -401,7 +473,7 @@ Slur::calc_cross_staff (SCM smob) so we can ignore them here */ vector non_sep_extras; for (vsize i = 0; i < extras.size (); i++) - if (!Separation_item::has_interface (extras[i])) + if (!has_interface (extras[i])) non_sep_extras.push_back (extras[i]); Grob *common = common_refpoint_of_array (cols, me, Y_AXIS); @@ -424,8 +496,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" @@ -469,6 +539,12 @@ ADD_INTERFACE (Slur, "@item head-slur-distance-max-ratio\n" "The maximum value for the ratio of distance between a" " note head and slur.\n" + "@item gap-to-staffline-inside\n" + "Minimum gap inside the curve of the slur" + " where the slur is parallel to a staffline.\n" + "@item gap-to-staffline-outside\n" + "Minimum gap outside the curve of the slur" + " where the slur is parallel to a staffline.\n" "@item free-slur-distance\n" "The amount of vertical free space that must exist" " between adjacent slurs. This subproperty only works" @@ -481,7 +557,7 @@ ADD_INTERFACE (Slur, /* properties */ "annotation " - "avoid-slur " /* UGH. */ + "avoid-slur " /* UGH. */ "control-points " "dash-definition " "details "