X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur.cc;h=2bc0ea072c9909ac2da9f10837aeccea648f4788;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=c2e00f243d34f85f0f1a76d813ed9009bb86a630;hpb=cbb205d40a19c0d2d9801031a63607e108a18038;p=lilypond.git diff --git a/lily/slur.cc b/lily/slur.cc index c2e00f243d..2bc0ea072c 100644 --- a/lily/slur.cc +++ b/lily/slur.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2007 Han-Wen Nienhuys + (c) 1996--2008 Han-Wen Nienhuys Jan Nieuwenhuizen */ @@ -14,6 +14,7 @@ #include "bezier.hh" #include "directional-element-interface.hh" #include "font-interface.hh" +#include "item.hh" #include "pointer-group-interface.hh" #include "lookup.hh" #include "main.hh" // DEBUG_SLUR_SCORING @@ -21,14 +22,13 @@ #include "output-def.hh" #include "spanner.hh" #include "staff-symbol-referencer.hh" -#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" +#include "international.hh" @@ -98,9 +98,6 @@ Slur::height (SCM smob) : ly_interval2scm (Interval ()); } -/* - Ugh should have dash-length + dash-period -*/ MAKE_SCHEME_CALLBACK (Slur, print, 1); SCM Slur::print (SCM smob) @@ -122,9 +119,6 @@ Slur::print (SCM smob) Bezier one = get_curve (me); Stencil a; - /* - TODO: replace dashed with generic property. - */ SCM p = me->get_property ("dash-period"); SCM f = me->get_property ("dash-fraction"); if (scm_is_number (p) && scm_is_number (f)) @@ -136,23 +130,26 @@ Slur::print (SCM smob) line_thick); #if DEBUG_SLUR_SCORING - SCM quant_score = me->get_property ("quant-score"); - - if (to_boolean (me->layout () - ->lookup_variable (ly_symbol2scm ("debug-slur-scoring"))) - && scm_is_string (quant_score)) + SCM annotation = me->get_property ("annotation"); + if (!scm_is_string (annotation)) + { + SCM debug = me->layout ()->lookup_variable (ly_symbol2scm ("debug-slur-scoring")); + if (to_boolean (debug)) + annotation = me->get_property ("quant-score"); + } + + if (scm_is_string (annotation)) { string str; SCM properties = Font_interface::text_font_alist_chain (me); - if (!scm_is_number (me->get_property ("font-size"))) properties = scm_cons (scm_acons (ly_symbol2scm ("font-size"), scm_from_int (-6), SCM_EOL), properties); Stencil tm = *unsmob_stencil (Text_interface::interpret_markup (me->layout ()->self_scm (), properties, - quant_score)); + annotation)); a.add_at_edge (Y_AXIS, get_grob_direction (me), tm, 1.0); } #endif @@ -180,7 +177,10 @@ Slur::replace_breakable_encompass_objects (Grob *me) { extract_grob_set (g, "elements", breakables); for (vsize j = 0; j < breakables.size (); j++) - if (breakables[j]->get_property ("avoid-slur") == ly_symbol2scm ("inside")) + /* 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")) new_encompasses.push_back (breakables[j]); } else @@ -308,11 +308,13 @@ Slur::outside_slur_callback (SCM grob, SCM offset_scm) } Real avoidance_offset = 0.0; - 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))); - + if (do_shift) + { + 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))); + } return scm_from_double (offset + avoidance_offset); } @@ -349,19 +351,70 @@ Slur::auxiliary_acknowledge_extra_object (Grob_info const &info, if (slur) { chain_offset_callback (e, 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 - e->warning ("Ignoring grob for slur. avoid-slur not set?"); + e->warning (_f ("Ignoring grob for slur: %s. avoid-slur not set?", + e->name().c_str ())); } +/* + A callback that will be chained together with the original cross-staff + value of a grob that is placed 'outside or 'around a slur. This just says + that any grob becomes cross-staff if it is placed 'outside or 'around a + cross-staff slur. +*/ +MAKE_SCHEME_CALLBACK (Slur, outside_slur_cross_staff, 2) +SCM +Slur::outside_slur_cross_staff (SCM smob, SCM previous) +{ + if (previous == SCM_BOOL_T) + return previous; + + Grob *me = unsmob_grob (smob); + Grob *slur = unsmob_grob (me->get_object ("slur")); + + if (!slur) + return SCM_BOOL_F; + return slur->get_property ("cross-staff"); +} + +MAKE_SCHEME_CALLBACK (Slur, calc_cross_staff, 1) +SCM +Slur::calc_cross_staff (SCM smob) +{ + Grob *me = unsmob_grob (smob); + + extract_grob_set (me, "note-columns", cols); + extract_grob_set (me, "encompass-objects", extras); + + for (vsize i = 0; i < cols.size (); i++) + { + if (Grob *s = Note_column::get_stem (cols[i])) + if (to_boolean (s->get_property ("cross-staff"))) + return SCM_BOOL_T; + } + + /* the separation items are dealt with in replace_breakable_encompass_objects + 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])) + non_sep_extras.push_back (extras[i]); + + Grob *common = common_refpoint_of_array (cols, me, Y_AXIS); + common = common_refpoint_of_array (non_sep_extras, common, Y_AXIS); + + return scm_from_bool (common != me->get_parent (Y_AXIS)); +} ADD_INTERFACE (Slur, - - "A slur", + "A slur.", /* properties */ + "annotation " "avoid-slur " /* UGH. */ "control-points " "dash-fraction "