X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=inline;f=lily%2Fslur.cc;h=8159e0dd3dc81fffff267a2d381a496f3baec188;hb=4ecdbd7d70ca7441be4dddd15ac01cc255bc2a35;hp=a115f5303c93333c284182fa902dd4bf93ea7650;hpb=5dfec3f8bf3a865ac9f9feaf3abbce6235349804;p=lilypond.git diff --git a/lily/slur.cc b/lily/slur.cc index a115f5303c..8159e0dd3d 100644 --- a/lily/slur.cc +++ b/lily/slur.cc @@ -3,32 +3,48 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2004 Han-Wen Nienhuys + (c) 1996--2005 Han-Wen Nienhuys Jan Nieuwenhuizen */ +#include "slur.hh" -#include +#include +using namespace std; #include "beam.hh" #include "bezier.hh" #include "directional-element-interface.hh" #include "font-interface.hh" -#include "group-interface.hh" -#include "lily-guile.hh" +#include "pointer-group-interface.hh" #include "lookup.hh" -#include "main.hh" +#include "main.hh" // DEBUG_SLUR_SCORING #include "note-column.hh" #include "output-def.hh" -#include "rod.hh" -#include "slur.hh" #include "spanner.hh" #include "staff-symbol-referencer.hh" #include "staff-symbol.hh" #include "stem.hh" -#include "stencil.hh" -#include "text-item.hh" +#include "text-interface.hh" #include "warn.hh" +#include "slur-scoring.hh" + +static Direction +get_default_dir (Grob *me) +{ + extract_grob_set (me, "note-columns", encompasses); + + Direction d = DOWN; + for (int i = 0; i < encompasses.size (); i++) + { + if (Note_column::dir (encompasses[i]) < 0) + { + d = UP; + break; + } + } + return d; +} MAKE_SCHEME_CALLBACK (Slur, height, 2); SCM @@ -48,39 +64,41 @@ Slur::height (SCM smob, SCM ax) /* Ugh should have dash-length + dash-period */ -MAKE_SCHEME_CALLBACK (Slur, print,1); +MAKE_SCHEME_CALLBACK (Slur, print, 1); 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.is_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_symbol_referencer::line_thickness (me); - - Real ss = Staff_symbol_referencer::staff_space (me); + Real thick = base_thick * staff_thick; Bezier one = get_curve (me); - Stencil a; /* TODO: replace dashed with generic property. */ - SCM d = me->get_property ("dashed"); - if (scm_is_number (d)) - a = Lookup::dashed_slur (one, thick, thick * robust_scm2double (d, 0)); + 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), + robust_scm2double (f, 0)); else - a = Lookup::slur (one, get_grob_direction (me) * base_thick * ss / 10.0, + a = Lookup::slur (one, + get_grob_direction (me) * staff_thick * 1.0, thick); -#if DEBUG_SLUR_QUANTING +#if DEBUG_SLUR_SCORING SCM quant_score = me->get_property ("quant-score"); - if (to_boolean (me->get_paper () + if (to_boolean (me->get_layout () ->lookup_variable (ly_symbol2scm ("debug-slur-scoring"))) && scm_is_string (quant_score)) { @@ -88,7 +106,7 @@ Slur::print (SCM smob) SCM properties = Font_interface::text_font_alist_chain (me); Stencil tm = *unsmob_stencil (Text_interface::interpret_markup - (me->get_paper ()->self_scm (), properties, + (me->get_layout ()->self_scm (), properties, quant_score)); a.add_at_edge (Y_AXIS, get_grob_direction (me), tm, 1.0, 0); } @@ -97,48 +115,55 @@ Slur::print (SCM smob) return a.smobbed_copy (); } - Bezier -Slur::get_curve (Grob*me) +Slur::get_curve (Grob *me) { Bezier b; int i = 0; for (SCM s = me->get_property ("control-points"); s != SCM_EOL; - s = ly_cdr (s)) - b.control_[i++] = ly_scm2offset (ly_car (s)); + s = scm_cdr (s)) + b.control_[i++] = ly_scm2offset (scm_car (s)); return b; } void -Slur::add_column (Grob*me, Grob*n) +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), dynamic_cast (n)); } - void -Slur::add_extra_encompass (Grob*me, Grob*n) +Slur::add_extra_encompass (Grob *me, Grob *n) { Pointer_group_interface::add_grob (me, ly_symbol2scm ("encompass-objects"), n); + me->add_dependency (n); } - - +#include "script-interface.hh" MAKE_SCHEME_CALLBACK (Slur, outside_slur_callback, 2); SCM Slur::outside_slur_callback (SCM grob, SCM axis) { Grob *script = unsmob_grob (grob); Axis a = Axis (scm_to_int (axis)); + (void) a; 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); - + + Direction dir = get_grob_direction (script); + if (dir == CENTER) + return scm_from_int (0); + + /* FIXME: this dependency should be automatic. */ + if (scm_ilength (slur->get_property ("control-points")) < 4) + Slur::after_line_breaking (slur->self_scm ()); + Grob *cx = script->common_refpoint (slur, X_AXIS); Grob *cy = script->common_refpoint (slur, Y_AXIS); @@ -150,52 +175,74 @@ 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); - + /* 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); - - 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; + SCM avoid = script->get_property ("avoid-slur"); - for (Direction d = LEFT ; d <= RIGHT; d = Direction (d + 1)) + for (int d = LEFT, k = 0; d <= RIGHT; d++, k++) { - Real x = xext.linear_combination (d); + Real x = xext.linear_combination ((Direction) d); consider[k] = bezext.contains (x); if (consider[k]) { - ys[k] = curve.get_other_coordinate (X_AXIS, x); + 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)); 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]) + || (avoid == ly_symbol2scm ("outside") + && dir * ys[k] > dir * yext[-dir])) do_shift = true; } } Real offset = 0.0; if (do_shift) { - k = 0; - Direction dir = get_grob_direction (script); - for (Direction d = LEFT ; d <= RIGHT; d = Direction (d + 1)) - { - offset = - dir * (dir * offset >? dir * (ys[k] - - yext[-dir] + dir * slur_padding)); - k++; - } + for (int d = LEFT, k = 0; d <= RIGHT; d++, k++) + offset = dir * (max (dir * offset, + dir * (ys[k] - yext[-dir] + dir * slur_padding))); } - - return scm_make_real (offset); + + return scm_from_double (offset); } +MAKE_SCHEME_CALLBACK (Slur, after_line_breaking, 1); +SCM +Slur::after_line_breaking (SCM smob) +{ + Spanner *me = dynamic_cast (unsmob_grob (smob)); + extract_grob_set (me, "note-columns", encompasses); + if (encompasses.is_empty ()) + { + 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", - "quant-score excentricity encompass-objects control-points dashed slur-details direction height-limit note-columns ratio thickness"); + "positions quant-score eccentricity encompass-objects control-points dash-period dash-fraction slur-details direction height-limit note-columns ratio thickness");