X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur.cc;h=c4acdd1694d9505e5a832df072351bce166f2ae5;hb=ba43faee242b37c23732aefb9fbce7eeb6d2eb25;hp=bc7d291bf5820b3fe04ebc0696898e9ce0012a26;hpb=8adca4c3e20f4663da5f9c8c887c8a3f2772bebf;p=lilypond.git diff --git a/lily/slur.cc b/lily/slur.cc index bc7d291bf5..c4acdd1694 100644 --- a/lily/slur.cc +++ b/lily/slur.cc @@ -1,695 +1,239 @@ /* - slur.cc -- implement Slur + slur.cc -- implement external interface for Slur source file of the GNU LilyPond music typesetter - (c) 1996--2002 Han-Wen Nienhuys - Jan Nieuwenhuizen + (c) 1996--2005 Han-Wen Nienhuys + Jan Nieuwenhuizen */ -/* - [TODO] - - * should avoid stafflines with horizontal part. - - * begin and end should be treated as a/acknowledge Scripts. - - * smart changing of endings +#include "slur.hh" - * smart changing of (Y-?)offsets to avoid ugly beziers - (along-side-stem) - - */ +#include +#include "beam.hh" +#include "bezier.hh" #include "directional-element-interface.hh" +#include "font-interface.hh" #include "group-interface.hh" -#include "slur.hh" #include "lookup.hh" -#include "paper-def.hh" +#include "main.hh" // DEBUG_SLUR_SCORING #include "note-column.hh" +#include "output-def.hh" +#include "spanner.hh" +#include "staff-symbol-referencer.hh" +#include "staff-symbol.hh" #include "stem.hh" -#include "paper-column.hh" -#include "molecule.hh" +#include "text-item.hh" #include "warn.hh" -#include "slur-bezier-bow.hh" -#include "main.hh" -#include "group-interface.hh" -#include "staff-symbol-referencer.hh" -#include "spanner.hh" - - -void -Slur::set_interface (Grob*me) -{ - /* Copy to mutable list. */ - me->set_grob_property ("attachment", - ly_deep_copy (me->get_grob_property ("attachment"))); -} - -void -Slur::add_column (Grob*me, Grob*n) -{ - if (!gh_pair_p (n->get_grob_property ("note-heads"))) - me->warning (_ ("Putting slur over rest.")); - - Pointer_group_interface::add_grob (me, ly_symbol2scm ("note-columns"), n); - me->add_dependency (n); +#include "slur-scoring.hh" - add_bound_item (dynamic_cast (me), dynamic_cast (n)); -} - -void -Slur::de_uglyfy (Grob*me, Slur_bezier_bow* bb, Real default_height) -{ - Real length = bb->curve_.control_[3][X_AXIS] ; - Real ff = bb->fit_factor (); - for (int i = 1; i < 3; i++) - { - Real ind = abs (bb->curve_.control_[ (i-1)*3][X_AXIS] - - bb->curve_.control_[i][X_AXIS]) / length; - Real h = bb->curve_.control_[i][Y_AXIS] * ff / length; - - Real f = default_height / length; - SCM up = me->get_grob_property ("de-uglify-parameters"); - - Real c1 = gh_scm2double (ly_car (up)); - Real c2 = gh_scm2double (ly_cadr (up)); - Real c3 = gh_scm2double (ly_caddr (up)); - - if (h > c1 * f) - { - h = c1 * f; - } - else if (h > c2 + c3 * ind) - { - h = c2 + c3 * ind; - } - - bb->curve_.control_[i][Y_AXIS] = h * length; - } - - bb->curve_.assert_sanity (); -} - - - -Direction -Slur::get_default_dir (Grob*me) -{ - Link_array encompass_arr = - Pointer_group_interface__extract_grobs (me, (Grob*)0, "note-columns"); - - Direction d = DOWN; - for (int i=0; i < encompass_arr.size (); i ++) - { - if (Note_column::dir (encompass_arr[i]) < 0) - { - d = UP; - break; - } - } - return d; -} - - -MAKE_SCHEME_CALLBACK (Slur, after_line_breaking,1); +MAKE_SCHEME_CALLBACK (Slur, height, 2); SCM -Slur::after_line_breaking (SCM smob) +Slur::height (SCM smob, SCM ax) { + Axis a = (Axis)scm_to_int (ax); Grob *me = unsmob_grob (smob); - if (!scm_ilength (me->get_grob_property ("note-columns"))) - { - me->suicide (); - return SCM_UNSPECIFIED; - } - set_extremities (me); - set_control_points (me); - return SCM_UNSPECIFIED; -} - - -void -Slur::check_slope (Grob *me) -{ - - /* - Avoid too steep slurs. - */ - SCM s = me->get_grob_property ("slope-limit"); - if (gh_number_p (s)) - { - Array encompass = get_encompass_offset_arr (me); - Drul_array attachment; - attachment[LEFT] = encompass[0]; - attachment[RIGHT] = encompass.top (); - - Real dx = attachment[RIGHT][X_AXIS] - attachment[LEFT][X_AXIS]; - Real dy = attachment[RIGHT][Y_AXIS] - attachment[LEFT][Y_AXIS]; - if (!dx) - return; - - Real slope = slope = abs (dy / dx); - - Real limit = gh_scm2double (s); - - if (slope > limit) - { - Real staff_space = Staff_symbol_referencer::staff_space ((Grob*)me); - Direction dir = (Direction)gh_scm2int (me->get_grob_property ("direction")); - Direction d = (Direction) (- dir * (sign (dy))); - SCM a = me->get_grob_property ("attachment-offset"); - Drul_array o; - o[LEFT] = ly_scm2offset (index_get_cell (a, LEFT)); - o[RIGHT] = ly_scm2offset (index_get_cell (a, RIGHT)); - o[d][Y_AXIS] -= (limit - slope) * dx * dir / staff_space; - - o[d][Y_AXIS] *= Directional_element_interface::get (me); - - me->set_grob_property ("attachment-offset", - gh_cons (ly_offset2scm (o[LEFT]), - ly_offset2scm (o[RIGHT]))); - } - } + assert (a == Y_AXIS); + SCM mol = me->get_uncached_stencil (); + Interval ext; + if (Stencil *m = unsmob_stencil (mol)) + ext = m->extent (a); + return ly_interval2scm (ext); } /* - Set 'attachment grob property, and return it. + Ugh should have dash-length + dash-period */ +MAKE_SCHEME_CALLBACK (Slur, print, 1); SCM -Slur::set_extremities (Grob *me) -{ - if (!Directional_element_interface::get (me)) - Directional_element_interface::set (me, get_default_dir (me)); - - SCM att = me->get_grob_property ("attachment"); - /* - */ - if (!gh_pair_p (att)) - { - programming_error ("attachment is not a cons?!"); - att = gh_cons (SCM_EOL, SCM_EOL); - me->set_grob_property ("attachment", att); - } - - Direction dir = LEFT; - do - { - - if (!gh_symbol_p (index_get_cell (att, dir))) - { - for (SCM s = me->get_grob_property ("extremity-rules"); - s != SCM_EOL; s = ly_cdr (s)) - { - SCM r = gh_call2 (ly_caar (s), me->self_scm (), - gh_int2scm ((int)dir)); - if (r != SCM_BOOL_F) - { - index_set_cell (att, dir, - ly_cdar (s)); - break; - } - } - } - } - while (flip (&dir) != LEFT); - - check_slope (me); - - return att; -} - - -Real -Slur::get_first_notecolumn_y (Grob *me, Direction dir) +Slur::print (SCM smob) { - SCM cols = me->get_grob_property ("note-columns"); - - if(!gh_pair_p (cols)) + Grob *me = unsmob_grob (smob); + if (!scm_ilength (me->get_property ("note-columns"))) { - programming_error ("No note-columns in slur?"); me->suicide (); - return 0.0; - } - - if (dir == LEFT) - cols = scm_reverse(cols); - - Grob *col = unsmob_grob (ly_car (cols)); - Grob *common[] = - { - 0, - me->common_refpoint (col, Y_AXIS) - }; - Real y; - if (col == ((Spanner*)me)->get_bound (dir)) - { - y = get_attachment (me, dir, common)[Y_AXIS]; - } - else - { - y = encompass_offset (me, col, common)[Y_AXIS] - - me->relative_coordinate (common[Y_AXIS], Y_AXIS); - } - return y; -} - -Offset -Slur::broken_trend_offset (Grob *me, Direction dir) -{ - /* - A broken slur should maintain the same vertical trend - the unbroken slur would have had. - */ - Offset o; - if (Spanner *mother = dynamic_cast (me->original_l_)) - { - for (int i = dir == LEFT ? 0 : mother->broken_into_l_arr_.size () - 1; - dir == LEFT ? i < mother->broken_into_l_arr_.size () : i > 0; - dir == LEFT ? i++ : i--) - { - if (mother->broken_into_l_arr_[i - dir] == me) - { - Grob *neighbour = mother->broken_into_l_arr_[i]; - if (dir == RIGHT) - neighbour->set_grob_property ("direction", - me->get_grob_property ("direction")); - Real neighbour_y = get_first_notecolumn_y (neighbour, dir); - Real y = get_first_notecolumn_y (me, -dir); - int neighbour_cols = scm_ilength (neighbour->get_grob_property ("note-columns")); - int cols = scm_ilength (me->get_grob_property ("note-columns")); - o = Offset (0, (y*neighbour_cols + neighbour_y*cols) / - (cols + neighbour_cols)); - break; - } - } + return SCM_EOL; } - return o; -} -/* - COMMON is size-2 array with common refpoints. + 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; + Bezier one = get_curve (me); + Stencil a; -UGH: this routine delivers offsets which are *not* relative to COMMON. -*/ -Offset -Slur::get_attachment (Grob *me, Direction dir, - Grob **common) -{ - SCM s = me->get_grob_property ("attachment"); - if (!gh_symbol_p (index_get_cell (s, dir))) - { - s = set_extremities (me); - } - - SCM a = dir == LEFT ? ly_car (s) : ly_cdr (s); - Spanner*sp = dynamic_cast (me); - String str = ly_symbol2string (a); - Real staff_space = Staff_symbol_referencer::staff_space ((Grob*)me); - Real hs = staff_space / 2.0; - Offset o; - - int slurdir = gh_scm2int (me->get_grob_property ("direction")); - - Grob *stem = 0; - if (Note_column::has_interface (sp->get_bound (dir))) - { - Grob * n =sp->get_bound (dir); - if ((stem = Note_column::stem_l (n))) - { - Real x_extent; - if (Grob *head = Note_column::first_head (n)) - x_extent = head->extent (head, X_AXIS).length (); - else - x_extent = n->extent (n, X_AXIS).length (); - - if (str == "head") - { - o = Offset (0, Stem::head_positions (stem) - [Directional_element_interface::get (me)] * hs); - /* - Default position is centered in X, on outer side of head Y - */ - o += Offset (0.5 * x_extent, - 0.5 * staff_space - * Directional_element_interface::get (me)); - } - else if (str == "alongside-stem") - { - o = Offset (0, Stem::chord_start_y (stem)); - /* - Default position is on stem X, on outer side of head Y - */ - o += Offset (x_extent * (1 + Stem::get_direction (stem)), - 0.5 * staff_space - * Directional_element_interface::get (me)); - } - else if (str == "stem") - { - o = Offset (0, Stem::stem_end_position (stem) * hs); - /* - Default position is on stem X, at stem end Y - */ - Real stem_thickness = - gh_scm2double (stem->get_grob_property ("thickness")) - * stem->paper_l ()->get_var ("linethickness"); - o += Offset (0.5 * - x_extent * (1 + Stem::get_direction (stem)) - - ((dir + 1)/2) * stem_thickness - + ((1 - slurdir)/2) * stem_thickness, - 0); - } - } - } /* - If we're not a note_column, we can't be anything but a loose-end. - But if user has set (attachment . (stem . stem)), our string is - stem, not loose-end. - - Hmm, maybe after-line-breaking should set this to loose-end? */ - else // if (str == "loose-end") - { - SCM other_a = dir == LEFT ? ly_cdr (s) : ly_car (s); - if (ly_symbol2string (other_a) != "loose-end") - o = broken_trend_offset (me, dir); - } + 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)) + a = Lookup::dashed_slur (one, thick, robust_scm2double (p, 1.0), + robust_scm2double (f, 0)); + else + a = Lookup::slur (one, + get_grob_direction (me) * staff_thick * 1.0, + thick); - SCM alist = me->get_grob_property ("extremity-offset-alist"); - int stemdir = stem ? Stem::get_direction (stem) : 1; - SCM l = scm_assoc - (scm_list_n (a, - gh_int2scm (stemdir * dir), - gh_int2scm (slurdir * dir), - SCM_UNDEFINED), alist); +#if DEBUG_SLUR_SCORING + SCM quant_score = me->get_property ("quant-score"); - if (l != SCM_BOOL_F) + if (to_boolean (me->get_layout () + ->lookup_variable (ly_symbol2scm ("debug-slur-scoring"))) + && scm_is_string (quant_score)) { - Offset off = ly_scm2offset (ly_cdr (l)) * staff_space; - off[X_AXIS] *= dir; - off[Y_AXIS] *= Directional_element_interface::get (me); - o += off; - } + String str; + SCM properties = Font_interface::text_font_alist_chain (me); - /* - What if get_bound () is not a note-column? - */ - if (str != "loose-end" - && sp->get_bound (dir)->common_refpoint (common[Y_AXIS], Y_AXIS) == common[Y_AXIS]) - { - o[Y_AXIS] += sp->get_bound (dir)->relative_coordinate (common[Y_AXIS], Y_AXIS) - - me->relative_coordinate (common[Y_AXIS], Y_AXIS); + Stencil tm = *unsmob_stencil (Text_interface::interpret_markup + (me->get_layout ()->self_scm (), properties, + quant_score)); + a.add_at_edge (Y_AXIS, get_grob_direction (me), tm, 1.0, 0); } +#endif - Offset off = ly_scm2offset (index_get_cell (me->get_grob_property - ("attachment-offset"), - dir)) * staff_space; - - off[Y_AXIS] *= Directional_element_interface::get (me); - o += off; - return o; + return a.smobbed_copy (); } -Offset -Slur::encompass_offset (Grob*me, - Grob* col, - Grob **common) +Bezier +Slur::get_curve (Grob *me) { - Offset o; - Grob* stem_l = unsmob_grob (col->get_grob_property ("stem")); - - Direction dir = Directional_element_interface::get (me); - - if (!stem_l) - { - me->warning (_ ("Slur over rest?")); - o[X_AXIS] = col->relative_coordinate (common[X_AXIS], X_AXIS); - o[Y_AXIS] = col->relative_coordinate (common[Y_AXIS], Y_AXIS); - return o; - } - Direction stem_dir = Directional_element_interface::get (stem_l); - o[X_AXIS] = stem_l->relative_coordinate (0, X_AXIS); - - /* - Simply set x to middle of notehead - */ - Real x_extent; - if (Grob *head = Note_column::first_head (col)) - x_extent = head->extent (head, X_AXIS).length (); - else - x_extent = col->extent (col, X_AXIS).length (); - o[X_AXIS] -= 0.5 * stem_dir * x_extent; - - if ((stem_dir == dir) - && !stem_l->extent (stem_l, Y_AXIS).empty_b ()) - { - o[Y_AXIS] = stem_l->extent (common[Y_AXIS], Y_AXIS)[dir]; - } - else - { - o[Y_AXIS] = col->extent (common[Y_AXIS], Y_AXIS)[dir]; - } + Bezier b; + int i = 0; + for (SCM s = me->get_property ("control-points"); s != SCM_EOL; + s = scm_cdr (s)) + b.control_[i++] = ly_scm2offset (scm_car (s)); - /* - leave a gap: slur mustn't touch head/stem - */ - o[Y_AXIS] += dir * gh_scm2double (me->get_grob_property ("y-free")) * - 1.0; - return o; + return b; } -Array -Slur::get_encompass_offset_arr (Grob *me) +void +Slur::add_column (Grob *me, Grob *n) { - Spanner*sp = dynamic_cast (me); - SCM eltlist = me->get_grob_property ("note-columns"); - Grob *common[] = {common_refpoint_of_list (eltlist, me, X_AXIS), - common_refpoint_of_list (eltlist, me, Y_AXIS)}; - - - common[X_AXIS] = common[X_AXIS]->common_refpoint (sp->get_bound (RIGHT), X_AXIS); - common[X_AXIS] = common[X_AXIS]->common_refpoint (sp->get_bound (LEFT), X_AXIS); - - Link_array encompass_arr = ly_scm2grob_array (eltlist); - Array offset_arr; - - Offset origin (me->relative_coordinate (common[X_AXIS], X_AXIS), - me->relative_coordinate (common[Y_AXIS], Y_AXIS)); - - int first = 1; - int last = encompass_arr.size () - 2; - - offset_arr.push (get_attachment (me, LEFT, common)); - - /* - left is broken edge - */ - if (encompass_arr[0] != sp->get_bound (LEFT)) - { - first--; - - // ? - offset_arr[0][Y_AXIS] -= - encompass_arr[0]->relative_coordinate (common[Y_AXIS], Y_AXIS) - - me->relative_coordinate (common[Y_AXIS], Y_AXIS); - } - - /* - right is broken edge - */ - if (encompass_arr.top () != sp->get_bound (RIGHT)) - { - last++; - } - - for (int i = first; i <= last; i++) - { - Offset o (encompass_offset (me, encompass_arr[i], common)); - offset_arr.push (o - origin); - } - - offset_arr.push (Offset (sp->spanner_length (), 0) + get_attachment (me, RIGHT,common)); - - if (encompass_arr[0] != sp->get_bound (LEFT)) - { - offset_arr.top ()[Y_AXIS] -= encompass_arr.top ()->relative_coordinate (common[Y_AXIS], Y_AXIS) - - me->relative_coordinate (common[Y_AXIS], Y_AXIS); - } - - return offset_arr; + Pointer_group_interface::add_grob (me, ly_symbol2scm ("note-columns"), n); + add_bound_item (dynamic_cast (me), dynamic_cast (n)); } - - - -/* - ugh ? - */ -MAKE_SCHEME_CALLBACK (Slur, height, 2); -SCM -Slur::height (SCM smob, SCM ax) +void +Slur::add_extra_encompass (Grob *me, Grob *n) { - Axis a = (Axis)gh_scm2int (ax); - Grob * me = unsmob_grob (smob); - assert (a == Y_AXIS); - - SCM mol = me->get_uncached_molecule (); - return ly_interval2scm (unsmob_molecule (mol)->extent (a)); + Pointer_group_interface::add_grob (me, ly_symbol2scm ("encompass-objects"), n); + me->add_dependency (n); } -/* - Ugh should have dash-length + dash-period - */ -MAKE_SCHEME_CALLBACK (Slur, brew_molecule,1); +MAKE_SCHEME_CALLBACK (Slur, outside_slur_callback, 2); SCM -Slur::brew_molecule (SCM smob) +Slur::outside_slur_callback (SCM grob, SCM axis) { - Grob * me = unsmob_grob (smob); - if (!scm_ilength (me->get_grob_property ("note-columns"))) - { - me->suicide (); - return SCM_EOL; - } + Grob *script = unsmob_grob (grob); + Axis a = Axis (scm_to_int (axis)); + (void) a; + assert (a == Y_AXIS); - Real thick = me->paper_l ()->get_var ("linethickness") * - gh_scm2double (me->get_grob_property ("thickness")); - Bezier one = get_curve (me); + Grob *slur = unsmob_grob (script->get_property ("slur")); - // get_curve may suicide - if (!scm_ilength (me->get_grob_property ("note-columns"))) - return SCM_EOL; + if (!slur) + return scm_from_int (0); - Molecule a; - SCM d = me->get_grob_property ("dashed"); - if (gh_number_p (d)) - a = Lookup::dashed_slur (one, thick, thick * gh_scm2double (d)); - else - a = Lookup::slur (one, Directional_element_interface::get (me) * thick, thick); + Grob *cx = script->common_refpoint (slur, X_AXIS); + Grob *cy = script->common_refpoint (slur, Y_AXIS); - return a.smobbed_copy (); -} + Bezier curve = Slur::get_curve (slur); -void -Slur::set_control_points (Grob*me) -{ - Real staff_space = Staff_symbol_referencer::staff_space ((Grob*)me); + curve.translate (Offset (slur->relative_coordinate (cx, X_AXIS), + slur->relative_coordinate (cy, Y_AXIS))); - SCM details = me->get_grob_property ("details"); - SCM h_inf_scm = scm_assq (ly_symbol2scm ("height-limit"), details); - SCM r_0_scm = scm_assq (ly_symbol2scm ("ratio"), details); + Interval yext = robust_relative_extent (script, cy, Y_AXIS); + Interval xext = robust_relative_extent (script, cx, X_AXIS); - Real r_0 = gh_scm2double (ly_cdr (r_0_scm)); - Real h_inf = staff_space * gh_scm2double (ly_cdr (h_inf_scm)); - - Slur_bezier_bow bb (get_encompass_offset_arr (me), - Directional_element_interface::get (me), - h_inf, r_0); + Real slur_padding = robust_scm2double (script->get_property ("slur-padding"), + 0.0); // todo: slur property, script property? + yext.widen (slur_padding); + Real EPS = 1e-3; + Interval bezext (curve.control_[0][X_AXIS], + curve.control_[3][X_AXIS]); - if (bb.fit_factor () > 1.0) - { - Real length = bb.curve_.control_[3][X_AXIS]; - Real default_height = slur_height (length, h_inf, r_0); - - SCM ssb = me->get_grob_property ("beautiful"); - Real sb = 0; - if (gh_number_p (ssb)) - sb = gh_scm2double (ssb); - - bb.minimise_enclosed_area (sb, details); - SCM sbf = scm_assq (ly_symbol2scm ("force-blowfit"), details); - Real bff = 1.0; - if (gh_pair_p (sbf) && gh_number_p (ly_cdr (sbf))) - bff = gh_scm2double (ly_cdr (sbf)); - - bb.curve_.control_[1][Y_AXIS] *= bff; - bb.curve_.control_[2][Y_AXIS] *= bff; - bb.blow_fit (); - - - Real beautiful = length * default_height * sb; - Real area = bb.enclosed_area_f (); - - /* - Slurs that fit beautifully are not ugly - */ - if (area > beautiful) - de_uglyfy (me, &bb, default_height); - } - - Bezier b = bb.get_bezier (); + bool consider[] = { false, false, false }; + Real ys[] = {0, 0, 0}; + int k = 0; + bool do_shift = false; + for (int d = LEFT; d <= RIGHT; d++) + { + Real x = xext.linear_combination ((Direction) d); + consider[k] = bezext.contains (x); - SCM controls = SCM_EOL; - for (int i= 4; i--;) + if (consider[k]) + { + 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])) + do_shift = true; + } + } + Real offset = 0.0; + if (do_shift) { - controls = gh_cons (ly_offset2scm (b.control_[i]), controls); - /* - BRRR WHURG. - All these null control-points, where do they all come from? - */ - if (i && b.control_[i][X_AXIS] == 0) + k = 0; + Direction dir = get_grob_direction (script); + for (int d = LEFT; d <= RIGHT; d++) { - me->suicide (); - return; + offset = dir * (max (dir * offset, + dir * (ys[k] - yext[-dir] + dir * slur_padding))); + k++; } } - me->set_grob_property ("control-points", controls); + return scm_make_real (offset); } - -Bezier -Slur::get_curve (Grob*me) -{ - Bezier b; - int i = 0; - - SCM attach = me->get_grob_property ("attachment"); - if (!gh_pair_p (attach)) - attach = set_extremities(me); - - - if (!Directional_element_interface::get (me) - || ! gh_symbol_p (index_get_cell (attach, LEFT)) - || ! gh_symbol_p (index_get_cell (attach, RIGHT))) - set_extremities (me); - - if (!gh_pair_p (me->get_grob_property ("control-points"))) - set_control_points (me); - // set_control_points may suicide - if (!scm_ilength (me->get_grob_property ("note-columns"))) - return b; - - for (SCM s= me->get_grob_property ("control-points"); s != SCM_EOL; s = ly_cdr (s)) - { - b.control_[i] = ly_scm2offset (ly_car (s)); - i++; - } - - Array enc (get_encompass_offset_arr (me)); - Direction dir = Directional_element_interface::get (me); - - Real x1 = enc[0][X_AXIS]; - Real x2 = enc.top ()[X_AXIS]; +static Direction +get_default_dir (Grob *me) +{ + Link_array encompasses + = extract_grob_array (me, ly_symbol2scm ("note-columns")); - Real off = 0.0; - for (int i=1; i < enc.size ()-1; i++) + Direction d = DOWN; + for (int i = 0; i < encompasses.size (); i++) { - Real x = enc[i][X_AXIS]; - if (x > x1 && x ? dir * (enc[i][Y_AXIS] - y); + d = UP; + break; } } - b.translate (Offset (0, dir * off)); - return b; + return d; } +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", - "slope-limit de-uglify-parameters details attachment direction attachment-offset beautiful y-free control-points extremity-rules extremity-offset-alist thickness dashed"); +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");