X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur.cc;h=d8c81f7836337258a4d1a09e9344d1a8f1f24070;hb=73d087a6589038ac21efe802fe6d51cafa411749;hp=929353c00a6f19d0abde93a866f3fc11a526b358;hpb=0358e5f9f5e937ee39ce35c60da2283858b60cfa;p=lilypond.git diff --git a/lily/slur.cc b/lily/slur.cc index 929353c00a..d8c81f7836 100644 --- a/lily/slur.cc +++ b/lily/slur.cc @@ -3,19 +3,18 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2005 Han-Wen Nienhuys + (c) 1996--2006 Han-Wen Nienhuys Jan Nieuwenhuizen */ #include "slur.hh" -#include #include "beam.hh" #include "bezier.hh" #include "directional-element-interface.hh" #include "font-interface.hh" -#include "group-interface.hh" +#include "pointer-group-interface.hh" #include "lookup.hh" #include "main.hh" // DEBUG_SLUR_SCORING #include "note-column.hh" @@ -24,23 +23,79 @@ #include "staff-symbol-referencer.hh" #include "staff-symbol.hh" #include "stem.hh" -#include "text-item.hh" +#include "text-interface.hh" +#include "tie.hh" #include "warn.hh" #include "slur-scoring.hh" -MAKE_SCHEME_CALLBACK (Slur, height, 2); +#include "script-interface.hh" + + + +MAKE_SCHEME_CALLBACK(Slur, calc_direction, 1) SCM -Slur::height (SCM smob, SCM ax) +Slur::calc_direction (SCM smob) { - Axis a = (Axis)scm_to_int (ax); Grob *me = unsmob_grob (smob); - assert (a == Y_AXIS); + extract_grob_set (me, "note-columns", encompasses); - SCM mol = me->get_uncached_stencil (); - Interval ext; - if (Stencil *m = unsmob_stencil (mol)) - ext = m->extent (a); - return ly_interval2scm (ext); + if (encompasses.empty ()) + { + me->suicide (); + return SCM_BOOL_F; + } + + Direction d = DOWN; + for (vsize i = 0; i < encompasses.size (); i++) + { + if (Note_column::dir (encompasses[i]) < 0) + { + d = UP; + break; + } + } + 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) +{ + Grob *me = unsmob_grob (smob); + + // FIXME uncached + Stencil *m = me->get_stencil (); + return m ? ly_interval2scm (m->extent (Y_AXIS)) + : ly_interval2scm (Interval ()); } /* @@ -51,19 +106,20 @@ SCM Slur::print (SCM smob) { Grob *me = unsmob_grob (smob); - if (!scm_ilength (me->get_property ("note-columns"))) + extract_grob_set (me, "note-columns", encompasses); + if (encompasses.empty ()) { me->suicide (); return SCM_EOL; } Real staff_thick = Staff_symbol_referencer::line_thickness (me); - Real base_thick = robust_scm2double (me->get_property ("thickness"), 1); - Real thick = base_thick * staff_thick; + Real base_thick = staff_thick + * robust_scm2double (me->get_property ("thickness"), 1); + Real line_thick = staff_thick + * robust_scm2double (me->get_property ("line-thickness"), 1); - Real ss = Staff_symbol_referencer::staff_space (me); Bezier one = get_curve (me); - Stencil a; /* @@ -72,25 +128,30 @@ Slur::print (SCM smob) SCM p = me->get_property ("dash-period"); SCM f = me->get_property ("dash-fraction"); if (scm_is_number (p) && scm_is_number (f)) - a = Lookup::dashed_slur (one, thick, robust_scm2double (p, 1.0), + a = Lookup::dashed_slur (one, line_thick, robust_scm2double (p, 1.0), robust_scm2double (f, 0)); else a = Lookup::slur (one, - get_grob_direction (me) * staff_thick * 1.0, - thick); + get_grob_direction (me) * base_thick, + line_thick); #if DEBUG_SLUR_SCORING SCM quant_score = me->get_property ("quant-score"); - if (to_boolean (me->get_layout () + if (to_boolean (me->layout () ->lookup_variable (ly_symbol2scm ("debug-slur-scoring"))) && scm_is_string (quant_score)) { - String str; + 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->get_layout ()->self_scm (), properties, + (me->layout ()->self_scm (), properties, quant_score)); a.add_at_edge (Y_AXIS, get_grob_direction (me), tm, 1.0, 0); } @@ -104,7 +165,7 @@ 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)); @@ -124,18 +185,25 @@ Slur::add_extra_encompass (Grob *me, Grob *n) Pointer_group_interface::add_grob (me, ly_symbol2scm ("encompass-objects"), n); } -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 axis) +Slur::outside_slur_callback (SCM grob, SCM offset_scm) { Grob *script = unsmob_grob (grob); - Axis a = Axis (scm_to_int (axis)); - assert (a == Y_AXIS); - - Grob *slur = unsmob_grob (script->get_property ("slur")); + Grob *slur = unsmob_grob (script->get_object ("slur")); if (!slur) - return scm_from_int (0); + return offset_scm; + + SCM avoid = script->get_property ("avoid-slur"); + if (avoid != ly_symbol2scm ("outside") + && avoid != ly_symbol2scm ("around")) + return offset_scm; + + Direction dir = get_grob_direction (script); + if (dir == CENTER) + return offset_scm; Grob *cx = script->common_refpoint (slur, X_AXIS); Grob *cy = script->common_refpoint (slur, Y_AXIS); @@ -148,20 +216,21 @@ Slur::outside_slur_callback (SCM grob, SCM axis) Interval yext = robust_relative_extent (script, cy, Y_AXIS); Interval xext = robust_relative_extent (script, cx, X_AXIS); + 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"), - 0.0); // todo: slur property, script property? + 0.0); yext.widen (slur_padding); - Real EPS = 1e-3; - - Interval bezext (curve.control_[0][X_AXIS], - curve.control_[3][X_AXIS]); + 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}; - int k = 0; bool do_shift = false; - - for (int d = LEFT; d <= RIGHT; d++) + + for (int d = LEFT, k = 0; d <= RIGHT; d++, k++) { Real x = xext.linear_combination ((Direction) d); consider[k] = bezext.contains (x); @@ -174,67 +243,86 @@ Slur::outside_slur_callback (SCM grob, SCM axis) : ((fabs (bezext[RIGHT] - x) < EPS) ? curve.control_[3][Y_AXIS] : curve.get_other_coordinate (X_AXIS, x)); - consider[k] = true; - if (yext.contains (ys[k])) + /* 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 offset = 0.0; - if (do_shift) - { - k = 0; - Direction dir = get_grob_direction (script); - for (int d = LEFT; d <= RIGHT; d++) - { - offset = dir * (dir * offset >? dir - * (ys[k] - yext[-dir] + dir * slur_padding)); - k++; - } - } - return scm_make_real (offset); + 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))); + + return scm_from_double (offset + avoidance_offset); } -static Direction -get_default_dir (Grob *me) +/* + * Used by Slur_engraver:: and Phrasing_slur_engraver:: + */ +void +Slur::auxiliary_acknowledge_extra_object (Grob_info info, + vector &slurs, + vector &end_slurs) { - Link_array encompasses - = extract_grob_array (me, ly_symbol2scm ("note-columns")); - - Direction d = DOWN; - for (int i = 0; i < encompasses.size (); i++) + 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")) { - if (Note_column::dir (encompasses[i]) < 0) + 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) { - d = UP; - break; + chain_offset_callback (e, outside_slur_callback_proc, Y_AXIS); + e->set_object ("slur", slur->self_scm ()); } } - return d; + else + e->warning ("Ignoring grob for slur. avoid-slur not set?"); } -MAKE_SCHEME_CALLBACK (Slur, after_line_breaking, 1); -SCM -Slur::after_line_breaking (SCM smob) -{ - Spanner *me = dynamic_cast (unsmob_grob (smob)); - if (!scm_ilength (me->get_property ("note-columns"))) - { - me->suicide (); - return SCM_UNSPECIFIED; - } - - if (!get_grob_direction (me)) - set_grob_direction (me, get_default_dir (me)); - - if (scm_ilength (me->get_property ("control-points")) < 4) - set_slur_control_points (me); - - return SCM_UNSPECIFIED; -} ADD_INTERFACE (Slur, "slur-interface", + "A slur", - "positions quant-score excentricity encompass-objects control-points dash-period dash-fraction slur-details direction height-limit note-columns ratio thickness"); + + /* properties */ + "avoid-slur " /* UGH. */ + "control-points " + "dash-fraction " + "dash-period " + "details " + "direction " + "eccentricity " + "encompass-objects " + "height-limit " + "inspect-quants " + "inspect-index " + "line-thickness " + "note-columns " + "positions " + "quant-score " + "ratio " + "thickness " + );