X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur.cc;h=7d2ca978c7afb1d46064136dcad85260eeb2e551;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=964a4d091b210e0ab78f4bb8c980291679a317e1;hpb=3f8a827aad721ed546b823e3f9f2605f61b90e20;p=lilypond.git diff --git a/lily/slur.cc b/lily/slur.cc index 964a4d091b..7d2ca978c7 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--2014 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,6 +40,7 @@ #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) @@ -70,15 +72,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 +101,31 @@ 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); + { + 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); } @@ -270,6 +301,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); @@ -284,8 +330,7 @@ Slur::outside_slur_callback (SCM grob, SCM offset_scm) Real EPS = 1.0e-5; if (avoid == ly_symbol2scm ("outside")) { - Direction d = LEFT; - do + for (LEFT_and_RIGHT (d)) { 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); @@ -293,14 +338,12 @@ Slur::outside_slur_callback (SCM grob, SCM offset_scm) if (do_shift) break; } - while (flip (&d) != LEFT); } else { for (int a = X_AXIS; a < NO_AXES; a++) { - Direction d = LEFT; - do + for (LEFT_and_RIGHT (d)) { vector coords = curve.get_other_coordinates (Axis (a), exts[a][d]); for (vsize i = 0; i < coords.size (); i++) @@ -312,7 +355,6 @@ Slur::outside_slur_callback (SCM grob, SCM offset_scm) if (do_shift) break; } - while (flip (&d) != LEFT); if (do_shift) break; } @@ -323,6 +365,29 @@ Slur::outside_slur_callback (SCM grob, SCM offset_scm) return scm_from_double (offset + avoidance_offset); } +MAKE_SCHEME_CALLBACK (Slur, vertical_skylines, 1); +SCM +Slur::vertical_skylines (SCM smob) +{ + Grob *me = unsmob_grob (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:: */ @@ -336,6 +401,12 @@ Slur::auxiliary_acknowledge_extra_object (Grob_info const &info, Grob *e = info.grob (); SCM avoid = e->get_property ("avoid-slur"); + Grob *slur; + if (end_slurs.size () && !slurs.size ()) + slur = end_slurs[0]; + else + slur = slurs[0]; + if (Tie::has_interface (e) || avoid == ly_symbol2scm ("inside")) { @@ -343,25 +414,24 @@ Slur::auxiliary_acknowledge_extra_object (Grob_info const &info, 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")) { - 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, + ly_make_unpure_pure_container (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?", + e->warning (_f ("Ignoring grob for slur: %s. avoid-slur not set?", e->name ().c_str ())); } @@ -429,8 +499,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" @@ -474,6 +542,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" @@ -486,7 +560,7 @@ ADD_INTERFACE (Slur, /* properties */ "annotation " - "avoid-slur " /* UGH. */ + "avoid-slur " /* UGH. */ "control-points " "dash-definition " "details "