X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur.cc;h=3b26af8bebabb63b83ba8c965cbf5687e45b696d;hb=e9a308e9c6002900fc336733950a0175bcbcc333;hp=16b63bef8dd9d51014a74e2eea969b74b620326e;hpb=9fc875b9848a49c370dd18051d242d6dbc761310;p=lilypond.git diff --git a/lily/slur.cc b/lily/slur.cc index 16b63bef8d..3b26af8beb 100644 --- a/lily/slur.cc +++ b/lily/slur.cc @@ -3,13 +3,13 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2006 Han-Wen Nienhuys + (c) 1996--2007 Han-Wen Nienhuys Jan Nieuwenhuizen */ #include "slur.hh" - - +#include "grob-info.hh" +#include "grob-array.hh" #include "beam.hh" #include "bezier.hh" #include "directional-element-interface.hh" @@ -24,9 +24,10 @@ #include "staff-symbol.hh" #include "stem.hh" #include "text-interface.hh" +#include "tie.hh" #include "warn.hh" #include "slur-scoring.hh" - +#include "separation-item.hh" #include "script-interface.hh" @@ -56,6 +57,35 @@ Slur::calc_direction (SCM smob) return scm_from_int (d); } +MAKE_SCHEME_CALLBACK (Slur, pure_height, 3); +SCM +Slur::pure_height (SCM smob, SCM start_scm, SCM end_scm) +{ + 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); + + extract_grob_set (me, "note-columns", encompasses); + Interval ret; + + Grob *parent = me->get_parent (Y_AXIS); + 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 */ + return ly_interval2scm (Interval ()); + + for (vsize i = 0; i < encompasses.size (); i++) + { + Interval d = encompasses[i]->pure_height (parent, start, end); + if (!d.is_empty ()) + ret.unite (d); + } + + ret.widen (height * 0.5); + return ly_interval2scm (ret); +} + MAKE_SCHEME_CALLBACK (Slur, height, 1); SCM Slur::height (SCM smob) @@ -123,19 +153,55 @@ Slur::print (SCM smob) Stencil tm = *unsmob_stencil (Text_interface::interpret_markup (me->layout ()->self_scm (), properties, quant_score)); - a.add_at_edge (Y_AXIS, get_grob_direction (me), tm, 1.0, 0); + a.add_at_edge (Y_AXIS, get_grob_direction (me), tm, 1.0); } #endif return a.smobbed_copy (); } + +/* + it would be better to do this at engraver level, but that is + fragile, as the breakabl items are generated on staff level, at + which point slur starts and ends have to be tracked +*/ +void +Slur::replace_breakable_encompass_objects (Grob *me) +{ + extract_grob_set (me, "encompass-objects", extra_objects); + vector new_encompasses; + + for (vsize i = 0; i < extra_objects.size (); i++) + { + Grob *g = extra_objects[i]; + + if (Separation_item::has_interface (g)) + { + extract_grob_set (g, "elements", breakables); + for (vsize j = 0; j < breakables.size (); j++) + if (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; + } +} + Bezier Slur::get_curve (Grob *me) { Bezier b; int i = 0; - for (SCM s = me->get_property ("control-points"); s != SCM_EOL; + for (SCM s = me->get_property ("control-points"); scm_is_pair (s); s = scm_cdr (s)) b.control_[i++] = ly_scm2offset (scm_car (s)); @@ -146,7 +212,7 @@ void Slur::add_column (Grob *me, Grob *n) { Pointer_group_interface::add_grob (me, ly_symbol2scm ("note-columns"), n); - add_bound_item (dynamic_cast (me), dynamic_cast (n)); + add_bound_item (dynamic_cast (me), n); } void @@ -155,8 +221,27 @@ Slur::add_extra_encompass (Grob *me, Grob *n) Pointer_group_interface::add_grob (me, ly_symbol2scm ("encompass-objects"), n); } +MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Slur, pure_outside_slur_callback, 4, 1, ""); +SCM +Slur::pure_outside_slur_callback (SCM grob, SCM start_scm, SCM end_scm, SCM offset_scm) +{ + 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")); + if (!slur) + return offset_scm; + + SCM avoid = script->get_property ("avoid-slur"); + if (avoid != ly_symbol2scm ("outside") && 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); +} -MAKE_SCHEME_CALLBACK (Slur, outside_slur_callback, 2); +MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Slur, outside_slur_callback, 2, 1, ""); SCM Slur::outside_slur_callback (SCM grob, SCM offset_scm) { @@ -186,8 +271,8 @@ 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); - yext.translate (robust_scm2double (offset_scm, 0)); - + Real offset = robust_scm2double (offset_scm, 0); + yext.translate (offset); /* FIXME: slur property, script property? */ Real slur_padding = robust_scm2double (script->get_property ("slur-padding"), @@ -228,12 +313,65 @@ Slur::outside_slur_callback (SCM grob, SCM offset_scm) avoidance_offset = dir * (max (dir * avoidance_offset, dir * (ys[k] - yext[-dir] + dir * slur_padding))); - return scm_from_double (scm_to_double (offset_scm) + avoidance_offset); + return scm_from_double (offset + avoidance_offset); } +/* + * Used by Slur_engraver:: and Phrasing_slur_engraver:: + */ +void +Slur::auxiliary_acknowledge_extra_object (Grob_info const &info, + vector &slurs, + vector &end_slurs) +{ + if (slurs.empty () && end_slurs.empty ()) + return; + + Grob *e = info.grob (); + SCM avoid = e->get_property ("avoid-slur"); + if (Tie::has_interface (e) + || 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); + } + 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); + e->set_object ("slur", slur->self_scm ()); + } + } + else + e->warning ("Ignoring grob for slur. avoid-slur not set?"); +} -ADD_INTERFACE (Slur, "slur-interface", +MAKE_SCHEME_CALLBACK (Slur, cross_staff, 1) +SCM +Slur::cross_staff (SCM smob) +{ + Grob *me = unsmob_grob (smob); + Grob *staff = Staff_symbol_referencer::get_staff_symbol (me); + assert (staff); // delete me + extract_grob_set (me, "note-columns", cols); + + for (vsize i = 0; i < cols.size (); i++) + if (Staff_symbol_referencer::get_staff_symbol (cols[i]) != staff) + return SCM_BOOL_T; + return SCM_BOOL_F; +} + +ADD_INTERFACE (Slur, "A slur", @@ -247,12 +385,13 @@ ADD_INTERFACE (Slur, "slur-interface", "eccentricity " "encompass-objects " "height-limit " + "inspect-quants " + "inspect-index " "line-thickness " "note-columns " "positions " "quant-score " "ratio " "thickness " - );