X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur.cc;h=4f71cc62a33add572e182748f1e4f3a84ac45794;hb=aab300b4e582627497ab12f8ea8609f03a3c8d84;hp=6f4d1c279ceb6c1027995acecd23201b3afbb5c5;hpb=f6e3a77381e8eb67aa01195ec3945bd978f86aa8;p=lilypond.git diff --git a/lily/slur.cc b/lily/slur.cc index 6f4d1c279c..4f71cc62a3 100644 --- a/lily/slur.cc +++ b/lily/slur.cc @@ -3,14 +3,22 @@ source file of the GNU LilyPond music typesetter - (c) 1996, 1997--1999 Han-Wen Nienhuys + (c) 1996--2003 Han-Wen Nienhuys Jan Nieuwenhuizen */ /* [TODO] + + * should avoid stafflines with horizontal part. + * begin and end should be treated as a/acknowledge Scripts. - * broken slur should have uniform trend + + * smart changing of endings + + * smart changing of (Y-?)offsets to avoid ugly beziers + (along-side-stem) + */ #include "directional-element-interface.hh" @@ -22,41 +30,79 @@ #include "stem.hh" #include "paper-column.hh" #include "molecule.hh" -#include "debug.hh" -#include "box.hh" -#include "bezier.hh" +#include "warn.hh" +#include "slur-bezier-bow.hh" #include "main.hh" -#include "cross-staff.hh" #include "group-interface.hh" +#include "staff-symbol-referencer.hh" +#include "spanner.hh" + -Slur::Slur () +void +Slur::set_interface (Grob*me) { - set_elt_property ("note-columns", SCM_EOL); + /* Copy to mutable list. */ + me->set_grob_property ("attachment", + ly_deep_copy (me->get_grob_property ("attachment"))); } void -Slur::add_column (Note_column*n) +Slur::add_column (Grob*me, Grob*n) { - if (!gh_pair_p (n->get_elt_property ("note-heads"))) - warning (_ ("Putting slur over rest. Ignoring.")); - else + 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); + + 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++) { - Group_interface gi (this, "note-columns"); - gi.add_element (n); - add_dependency (n); - } + 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 () const +Slur::get_default_dir (Grob*me) { - Link_array encompass_arr = - Group_interface__extract_elements (this, (Note_column*)0, "note-columns"); + Link_array encompasses = + Pointer_group_interface__extract_grobs (me, (Grob*)0, "note-columns"); Direction d = DOWN; - for (int i=0; i < encompass_arr.size (); i ++) + for (int i=0; i < encompasses.size (); i ++) { - if (encompass_arr[i]->dir () < 0) + if (Note_column::dir (encompasses[i]) < 0) { d = UP; break; @@ -65,454 +111,585 @@ Slur::get_default_dir () const return d; } -void -Slur::do_add_processing () -{ - Link_array encompass_arr = - Group_interface__extract_elements (this, (Note_column*)0, "note-columns"); - set_bounds (LEFT, encompass_arr[0]); - if (encompass_arr.size () > 1) - set_bounds (RIGHT, encompass_arr.top ()); -} -void -Slur::do_pre_processing () +MAKE_SCHEME_CALLBACK (Slur, after_line_breaking,1); +SCM +Slur::after_line_breaking (SCM smob) { - // don't set directions -} + 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; +} -Offset -Slur::encompass_offset (Note_column const* col) const +void +Slur::check_slope (Grob *me) { - Offset o; - Stem* stem_l = col->stem_l (); - Direction dir = directional_element (this).get (); - - if (!stem_l) - { - warning (_ ("Slur over rest?")); - o[X_AXIS] = col->hpos_f (); - o[Y_AXIS] = col->extent (Y_AXIS)[dir]; - return o; - } - Direction stem_dir = directional_element (stem_l).get (); - o[X_AXIS] = stem_l->hpos_f (); /* - Simply set x to middle of notehead + Avoid too steep slurs. */ + SCM s = me->get_grob_property ("slope-limit"); + if (gh_number_p (s)) + { + Array encompass = get_encompass_offsets (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); - o[X_AXIS] -= 0.5 * stem_dir * col->extent (X_AXIS).length (); + Real limit = gh_scm2double (s); - if ((stem_dir == dir) - && !stem_l->extent (Y_AXIS).empty_b ()) - { - o[Y_AXIS] = stem_l->extent (Y_AXIS)[dir]; - } - else - { - o[Y_AXIS] = col->extent (Y_AXIS)[dir]; + 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]))); + } } - /* - leave a gap: slur mustn't touch head/stem - */ - o[Y_AXIS] += dir * paper_l ()->get_var ("slur_y_free"); - o[Y_AXIS] += calc_interstaff_dist (stem_l, this); - return o; } /* - ARGRARGRARGRARGAR! - - Fixme - */ -void -Slur::do_post_processing () + Set 'attachment grob property, and return it. +*/ +SCM +Slur::set_extremities (Grob *me) { - Link_array encompass_arr = - Group_interface__extract_elements (this, (Note_column*)0, "note-columns"); - - - if (!directional_element (this).get ()) - directional_element (this).set (get_default_dir ()); - - /* - Slur and tie placement [OSU] - - Slurs: - * x = centre of head - d * x_gap_f - - TODO: - * y = length < 5ss : horizontal tangent + d * 0.25 ss - y = length >= 5ss : y next interline - d * 0.25 ss - */ - - Real staff_space = paper_l ()->get_var ("interline"); - Real half_staff_space = staff_space / 2; + if (!Directional_element_interface::get (me)) + Directional_element_interface::set (me, get_default_dir (me)); - Real x_gap_f = paper_l ()->get_var ("slur_x_gap"); - Real y_gap_f = paper_l ()->get_var ("slur_y_gap"); - - Drul_array note_column_drul; - note_column_drul[LEFT] = encompass_arr[0]; - note_column_drul[RIGHT] = encompass_arr.top (); - - bool fix_broken_b = false; - - Direction my_dir = directional_element (this).get (); - - Direction d = LEFT; + 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 { - dx_f_drul_[d] = 0; - dy_f_drul_[d] = 0; - - if ((note_column_drul[d] == spanned_drul_[d]) - && note_column_drul[d]->first_head () - && (note_column_drul[d]->stem_l ())) + + if (!gh_symbol_p (index_get_cell (att, dir))) { - Stem* stem_l = note_column_drul[d]->stem_l (); - /* - side directly attached to note head; - no beam getting in the way - */ - if ((stem_l->extent (Y_AXIS).empty_b () - || !((stem_l->get_direction () == my_dir) && (my_dir != d))) - && !((my_dir == stem_l->get_direction ()) - && stem_l->beam_l () && (stem_l->beam_count (-d) >= 1))) - { - dx_f_drul_[d] = spanned_drul_[d]->extent (X_AXIS).length () / 2; - dx_f_drul_[d] -= d * x_gap_f; - - if (stem_l->get_direction () != my_dir) - { - dy_f_drul_[d] = note_column_drul[d]->extent (Y_AXIS)[my_dir]; - } - else - { - dy_f_drul_[d] = stem_l->chord_start_f () - + my_dir * half_staff_space; - } - dy_f_drul_[d] += my_dir * y_gap_f; - } - /* - side attached to (visible) stem - */ - else + for (SCM s = me->get_grob_property ("extremity-rules"); + s != SCM_EOL; s = ly_cdr (s)) { - dx_f_drul_[d] = stem_l->hpos_f () - - spanned_drul_[d]->relative_coordinate (0, X_AXIS); - /* - side attached to beamed stem - */ - if (stem_l->beam_l () && (stem_l->beam_count (-d) >= 1)) - { - dy_f_drul_[d] = stem_l->extent (Y_AXIS)[my_dir]; - dy_f_drul_[d] += my_dir * 2 * y_gap_f; - } - /* - side attached to notehead, with stem getting in the way - */ - else + SCM r = gh_call2 (ly_caar (s), me->self_scm (), + gh_int2scm ((int)dir)); + if (r != SCM_BOOL_F) { - dx_f_drul_[d] -= d * x_gap_f; - - dy_f_drul_[d] = stem_l->chord_start_f () - + my_dir * half_staff_space; - dy_f_drul_[d] += my_dir * y_gap_f; + index_set_cell (att, dir, + ly_cdar (s)); + break; } } } - /* - loose end - */ - else - { - dx_f_drul_[d] = get_broken_left_end_align (); - - /* - broken: should get y from other piece, so that slur - continues up/down trend - - for now: be horizontal.. - */ - fix_broken_b = true; - } } - while (flip (&d) != LEFT); + while (flip (&dir) != LEFT); - int cross_count = cross_staff_count (); - bool interstaff_b = (0 < cross_count) && (cross_count < encompass_arr.size ()); + check_slope (me); - Drul_array info_drul; - Drul_array interstaff_interval; + return att; +} + + +Real +Slur::get_first_notecolumn_y (Grob *me, Direction dir) +{ + SCM cols = me->get_grob_property ("note-columns"); - do + if(!gh_pair_p (cols)) { - info_drul[d] = encompass_offset (encompass_arr.boundary (d, 0)); - interstaff_interval[d] = calc_interstaff_dist (encompass_arr.boundary (d,0), - this); + programming_error ("No note-columns in slur?"); + me->suicide (); + return 0.0; } - while (flip (&d) != LEFT); - Real interstaff_f = interstaff_interval[RIGHT] - interstaff_interval[LEFT]; + 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; +} - if (fix_broken_b) +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_)) { - Direction d = (encompass_arr.top () != spanned_drul_[RIGHT]) ? - RIGHT : LEFT; - dy_f_drul_[d] = info_drul[d][Y_AXIS]; - if (!interstaff_b) + for (int i = dir == LEFT ? 0 : mother->broken_intos_.size () - 1; + dir == LEFT ? i < mother->broken_intos_.size () : i > 0; + dir == LEFT ? i++ : i--) { - dy_f_drul_[d] -= interstaff_interval[d]; - if (cross_count) // interstaff_i ? + if (mother->broken_intos_[i - dir] == me) { - dy_f_drul_[LEFT] += interstaff_interval[d]; - dy_f_drul_[RIGHT] += interstaff_interval[d]; + Grob *neighbour = mother->broken_intos_[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; } } } - - - /* - Now we've got a fine slur - Catch and correct some ugly cases - */ - String infix = interstaff_b ? "interstaff_" : ""; - Real height_damp_f = paper_l ()->get_var ("slur_"+infix +"height_damping"); - Real slope_damp_f = paper_l ()->get_var ("slur_"+infix +"slope_damping"); - Real snap_f = paper_l ()->get_var ("slur_"+infix +"snap_to_stem"); - Real snap_max_dy_f = paper_l ()->get_var ("slur_"+infix +"snap_max_slope_change"); - - if (!fix_broken_b) - dy_f_drul_[RIGHT] += interstaff_f; + return o; +} - Real dy_f = dy_f_drul_[RIGHT] - dy_f_drul_[LEFT]; - if (!fix_broken_b) - dy_f -= interstaff_f; - Real dx_f = spanner_length ()+ dx_f_drul_[RIGHT] - dx_f_drul_[LEFT]; +/* + COMMON is size-2 array with common refpoints. - /* - Avoid too steep slurs. - */ - Real slope_ratio_f = abs (dy_f / dx_f); - if (slope_ratio_f > slope_damp_f) +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))) { - Direction d = (Direction)(- my_dir * (sign (dy_f))); - if (!d) - d = LEFT; - Real damp_f = (slope_ratio_f - slope_damp_f) * dx_f; - /* - must never change sign of dy - */ - damp_f = damp_f (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))) { - Real height_f = curve_extent (Y_AXIS).length (); - Real width_f = curve_extent (X_AXIS).length (); - - dy_f = dy_f_drul_[RIGHT] - dy_f_drul_[LEFT]; - if (!fix_broken_b) - dy_f -= interstaff_f; - - Real height_ratio_f = abs (height_f / width_f); - if (height_ratio_f > height_damp_f) + Grob * n =sp->get_bound (dir); + if ((stem = Note_column::get_stem (n))) { - Direction d = (Direction)(- my_dir * (sign (dy_f))); - if (!d) - d = LEFT; - /* take third step */ - Real damp_f = (height_ratio_f - height_damp_f) * width_f / 3; - /* - if y positions at about the same height, correct both ends - */ - if (abs (dy_f / dx_f ) < slope_damp_f) + 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") { - dy_f_drul_[-d] += my_dir * damp_f; - dy_f_drul_[d] += my_dir * damp_f; + 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)); } - /* - don't change slope too much, would have been catched by slope damping - */ - else + else if (str == "stem") { - damp_f = damp_f get_grob_property ("thickness")) + * stem->get_paper ()->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, after correcting, we're close to stem-end... - */ - Drul_array snapy_f_drul; - snapy_f_drul[LEFT] = snapy_f_drul[RIGHT] = 0; - Drul_array snapx_f_drul; - snapx_f_drul[LEFT] = snapx_f_drul[RIGHT] = 0; - Drul_array snapped_b_drul; - snapped_b_drul[LEFT] = snapped_b_drul[RIGHT] = false; - do + 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") { - Note_column * nc = note_column_drul[d]; - if (nc == spanned_drul_[d] - && nc->stem_l () - && nc->stem_l ()->get_direction () == my_dir - && abs (nc->stem_l ()->extent (Y_AXIS)[my_dir] - - dy_f_drul_[d] + (d == LEFT ? 0 : interstaff_f)) - <= snap_f) - { - /* - prepare to attach to stem-end - */ - snapx_f_drul[d] = nc->stem_l ()->hpos_f () - - spanned_drul_[d]->relative_coordinate (0, X_AXIS); - - snapy_f_drul[d] = nc->stem_l ()->extent (Y_AXIS)[my_dir] - + interstaff_interval[d] - + my_dir * 2 * y_gap_f; - - snapped_b_drul[d] = true; - } + SCM other_a = dir == LEFT ? ly_cdr (s) : ly_car (s); + if (ly_symbol2string (other_a) != "loose-end") + o = broken_trend_offset (me, dir); } - while (flip (&d) != LEFT); - /* - only use snapped positions if sign (dy) will not change - and dy doesn't change too much - */ - if (!fix_broken_b) - dy_f += interstaff_f; + 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 (l != SCM_BOOL_F) + { + Offset off = ly_scm2offset (ly_cdr (l)) * staff_space; + off[X_AXIS] *= dir; + off[Y_AXIS] *= Directional_element_interface::get (me); + o += off; + } /* - (sigh) - - More refactoring could be done. + What if get_bound () is not a note-column? */ - Real maxsnap = abs (dy_f * snap_max_dy_f); - if (snapped_b_drul[LEFT] && snapped_b_drul[RIGHT] - && ((sign (snapy_f_drul[RIGHT] - snapy_f_drul[LEFT]) == sign (dy_f))) - && (!dy_f || (abs (snapy_f_drul[RIGHT] - snapy_f_drul[LEFT] - dy_f) - < maxsnap))) - { - dy_f_drul_ = snapy_f_drul; - dx_f_drul_ = snapx_f_drul; + 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); } - else - do - { - Direction od = (Direction)-d; - if (snapped_b_drul[d] - && d * sign (snapy_f_drul[d] - dy_f_drul_[od]) == sign (dy_f) - && (!dy_f || (abs (snapy_f_drul[d] - dy_f_drul_[od] - d * dy_f) - < maxsnap))) - { - dy_f_drul_[d] = snapy_f_drul[d]; - dx_f_drul_[d] = snapx_f_drul[d]; - } - } - while (flip (&d) != LEFT); -} + 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; +} -int -Slur::cross_staff_count ()const +Offset +Slur::encompass_offset (Grob*me, + Grob* col, + Grob **common) { - Link_array encompass_arr = - Group_interface__extract_elements (this, (Note_column*)0, "note-columns"); + Offset o; + Grob* stem = unsmob_grob (col->get_grob_property ("stem")); + + Direction dir = Directional_element_interface::get (me); + + if (!stem) + { + 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); + o[X_AXIS] = stem->relative_coordinate (0, X_AXIS); - int k=0; + /* + 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; - for (int i = 0; i < encompass_arr.size (); i++) + if ((stem_dir == dir) + && !stem->extent (stem, Y_AXIS).empty_b ()) { - if (calc_interstaff_dist (encompass_arr[i], this)) - k++; + o[Y_AXIS] = stem->extent (common[Y_AXIS], Y_AXIS)[dir]; + } + else + { + o[Y_AXIS] = col->extent (common[Y_AXIS], Y_AXIS)[dir]; } - return k; -} + /* + 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; +} Array -Slur::get_encompass_offset_arr () const +Slur::get_encompass_offsets (Grob *me) { - Link_array encompass_arr = - Group_interface__extract_elements (this, (Note_column*)0, "note-columns"); - - Array offset_arr; -#if 0 - /* - check non-disturbed slur - FIXME: x of ends off by a tiny bit!! - */ - offset_arr.push (Offset (0, dy_f_drul_[LEFT])); - offset_arr.push (Offset (0, dy_f_drul_[RIGHT])); - return offset_arr; -#endif + 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); - Offset origin (relative_coordinate (0, X_AXIS), 0); + Link_array encompasses = ly_scm2grobs (eltlist); + Array offsets; + + 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; + int last = encompasses.size () - 2; - offset_arr.push (Offset (dx_f_drul_[LEFT], dy_f_drul_[LEFT])); + offsets.push (get_attachment (me, LEFT, common)); /* left is broken edge */ - - int cross_count = cross_staff_count (); - bool cross_b = cross_count && cross_count < encompass_arr.size (); - if (encompass_arr[0] != spanned_drul_[LEFT]) + if (encompasses[0] != sp->get_bound (LEFT)) { first--; - Real is = calc_interstaff_dist (encompass_arr[0], this); - if (cross_b) - offset_arr[0][Y_AXIS] += is; + + // ? + offsets[0][Y_AXIS] -= + encompasses[0]->relative_coordinate (common[Y_AXIS], Y_AXIS) + - me->relative_coordinate (common[Y_AXIS], Y_AXIS); } /* right is broken edge */ - if (encompass_arr.top () != spanned_drul_[RIGHT]) + if (encompasses.top () != sp->get_bound (RIGHT)) { last++; } for (int i = first; i <= last; i++) { - Offset o (encompass_offset (encompass_arr[i])); - offset_arr.push (o - origin); + Offset o (encompass_offset (me, encompasses[i], common)); + offsets.push (o - origin); + } + + offsets.push (Offset (sp->spanner_length (), 0) + get_attachment (me, RIGHT,common)); + + if (encompasses[0] != sp->get_bound (LEFT)) + { + offsets.top ()[Y_AXIS] -= encompasses.top ()->relative_coordinate (common[Y_AXIS], Y_AXIS) + - me->relative_coordinate (common[Y_AXIS], Y_AXIS); + } + + return offsets; +} + + + + +/* + ugh ? + */ +MAKE_SCHEME_CALLBACK (Slur, height, 2); +SCM +Slur::height (SCM smob, SCM ax) +{ + 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)); +} + +/* + Ugh should have dash-length + dash-period + */ +MAKE_SCHEME_CALLBACK (Slur, brew_molecule,1); +SCM +Slur::brew_molecule (SCM smob) +{ + Grob * me = unsmob_grob (smob); + if (!scm_ilength (me->get_grob_property ("note-columns"))) + { + me->suicide (); + return SCM_EOL; } - offset_arr.push (Offset (spanner_length ()+ dx_f_drul_[RIGHT], - dy_f_drul_[RIGHT])); + Real thick = me->get_paper ()->get_var ("linethickness") * + gh_scm2double (me->get_grob_property ("thickness")); + Bezier one = get_curve (me); - return offset_arr; + // get_curve may suicide + if (!scm_ilength (me->get_grob_property ("note-columns"))) + return SCM_EOL; + + 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); + + return a.smobbed_copy (); } +void +Slur::set_control_points (Grob*me) +{ + Real staff_space = Staff_symbol_referencer::staff_space ((Grob*)me); + + SCM details = me->get_grob_property ("details"); + SCM h_inf_scm = me->get_grob_property ("height-limit"); + SCM r_0_scm = me->get_grob_property ("ratio"); + + Real r_0 = gh_scm2double (r_0_scm); + Real h_inf = staff_space * gh_scm2double (h_inf_scm); + + Slur_bezier_bow bb (get_encompass_offsets (me), + Directional_element_interface::get (me), + h_inf, r_0); + + + 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.get_enclosed_area (); + + /* + Slurs that fit beautifully are not ugly + */ + if (area > beautiful) + de_uglyfy (me, &bb, default_height); + } + + Bezier b = bb.get_bezier (); + + + SCM controls = SCM_EOL; + for (int i= 4; i--;) + { + 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) + { + me->suicide (); + return; + } + } -Array -Slur::get_rods () const + me->set_grob_property ("control-points", controls); +} + +Bezier +Slur::get_curve (Grob*me) { - Array a; - Rod r; - r.item_l_drul_ = spanned_drul_; - r.distance_f_ = paper_l ()->get_var ("slur_x_minimum"); + Bezier b; + int i = 0; + + SCM attach = me->get_grob_property ("attachment"); + if (!gh_pair_p (attach)) + attach = set_extremities(me); - a.push (r); - return a; + + 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_offsets (me)); + Direction dir = Directional_element_interface::get (me); + + Real x1 = enc[0][X_AXIS]; + Real x2 = enc.top ()[X_AXIS]; + + Real off = 0.0; + for (int i=1; i < enc.size ()-1; i++) + { + Real x = enc[i][X_AXIS]; + if (x > x1 && x ? dir * (enc[i][Y_AXIS] - y); + } + } + b.translate (Offset (0, dir * off)); + return b; } + + +ADD_INTERFACE (Slur,"slur-interface", + "A slur", + "attachment attachment-offset beautiful control-points dashed details de-uglify-parameters direction extremity-rules extremity-offset-alist height-limit ratio slope-limit thickness y-free"); +