X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fslur.cc;h=cf4d2897f89190d7a16cadd5b1ee13c7592996ba;hb=d9b43b93f2c885409bafdb157138158f65cc49aa;hp=504219f39305e29893e3552908c85eaba30d6d44;hpb=a1d72ee4c631e40978415d31666337beaebceabc;p=lilypond.git diff --git a/lily/slur.cc b/lily/slur.cc index 504219f393..cf4d2897f8 100644 --- a/lily/slur.cc +++ b/lily/slur.cc @@ -3,54 +3,101 @@ source file of the GNU LilyPond music typesetter - (c) 1996, 1997--1999, 1998 Han-Wen Nienhuys + (c) 1996--2002 Han-Wen Nienhuys Jan Nieuwenhuizen */ /* [TODO] - * URG: share code with tie - * begin and end should be treated as a Script. - * damping - * slur from notehead to stemend: c''()b'' + * should avoid stafflines with horizontal part. + * begin and end should be treated as a/acknowledge Scripts. + * smart changing of endings + * smart changing of (Y-?)offsets to avoid ugly beziers + (along-side-stem) */ +#include "directional-element-interface.hh" +#include "group-interface.hh" #include "slur.hh" -#include "scalar.hh" #include "lookup.hh" #include "paper-def.hh" #include "note-column.hh" #include "stem.hh" -#include "p-col.hh" +#include "paper-column.hh" #include "molecule.hh" #include "debug.hh" -#include "box.hh" -#include "bezier.hh" -#include "encompass-info.hh" +#include "slur-bezier-bow.hh" #include "main.hh" +#include "group-interface.hh" +#include "staff-symbol-referencer.hh" +#include "spanner.hh" -Slur::Slur () +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"))) + warning (_ ("Putting slur over rest. Ignoring.")); + else + { + 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::add_column (Note_column*n) +Slur::de_uglyfy (Grob*me, Slur_bezier_bow* bb, Real default_height) { - if (!n->head_l_arr_.size ()) - warning (_ ("Putting slur over rest.")); - encompass_arr_.push (n); - // n->stem_l_->slur_l_ = this; - add_dependency (n); + 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 () const +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 ++) + for (int i=0; i < encompass_arr.size (); i ++) { - if (encompass_arr_[i]->dir () < 0) + if (Note_column::dir (encompass_arr[i]) < 0) { d = UP; break; @@ -59,319 +106,563 @@ Slur::get_default_dir () const return d; } -void -Slur::do_add_processing () + +MAKE_SCHEME_CALLBACK (Slur, after_line_breaking,1); +SCM +Slur::after_line_breaking (SCM smob) { - set_bounds (LEFT, encompass_arr_[0]); - if (encompass_arr_.size () > 1) - set_bounds (RIGHT, encompass_arr_.top ()); -} + 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::do_pre_processing () +Slur::check_slope (Grob *me) { - // don't set directions + /* + 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_cell (a, LEFT)); + o[RIGHT] = ly_scm2offset (index_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]))); + } + } } void -Slur::do_substitute_element_pointer (Score_element*o, Score_element*n) +Slur::set_extremities (Grob *me) { - int i; - while ((i = encompass_arr_.find_i (dynamic_cast (o))) >=0) + if (!Directional_element_interface::get (me)) + Directional_element_interface::set (me, get_default_dir (me)); + + Direction dir = LEFT; + do { - if (n) - encompass_arr_[i] = dynamic_cast (n); - else - encompass_arr_.del (i); + 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); + } + + if (!gh_symbol_p (index_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); -static int -Note_column_compare (Note_column *const&n1 , Note_column* const&n2) -{ - return Item::left_right_compare (n1, n2); + check_slope (me); } -bool -Slur::broken_edge_b ( Direction dir) const -{ - return extrema ()[dir] != spanned_drul_[dir]; -} -bool -Slur::normal_edge_b ( Direction dir) const +Real +Slur::get_first_notecolumn_y (Grob *me, Direction dir) { - Note_column *n = extrema ()[dir]; - return !broken_edge_b ( dir) - && n->stem_l_ - && n->stem_l_->get_elt_property (transparent_scm_sym) == SCM_BOOL_F - && n->head_l_arr_.size (); + Grob *col = dir == LEFT + ? unsmob_grob (ly_car (scm_reverse (me->get_grob_property + ("note-columns")))) + : unsmob_grob + (ly_car (me->get_grob_property ("note-columns"))); + + 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; } -Drul_array -Slur::extrema ()const +Offset +Slur::broken_trend_offset (Grob *me, Direction dir) { - Drul_array extrema; - extrema[LEFT] = encompass_arr_[0]; - extrema[RIGHT] = encompass_arr_.top (); - return extrema; + /* + 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 o; } -/* - TODO. - - Unhair this. - */ -void -Slur::do_post_processing () +Offset +Slur::get_attachment (Grob *me, Direction dir, + Grob **common) { - encompass_arr_.sort (Note_column_compare); - if (!dir_) - dir_ = get_default_dir (); - - Real interline_f = paper_l ()->get_realvar (interline_scm_sym); - Real internote_f = interline_f / 2; - // URG - Real notewidth_f = paper_l ()->note_width () * 0.8; - - /* - [OSU]: slur and tie placement - - slurs: - * x = center of head (upside-down: inner raakpunt stem) - d * gap - - * y = length < 5ss : horizontal raakpunt + d * 0.25 ss - y = length >= 5ss : y next interline - d * 0.25 ss - --> height <= 5 length ?? we use <= 3 length, now... - */ + SCM s = me->get_grob_property ("attachment"); + if (!gh_symbol_p (index_cell (s, dir))) + { + set_extremities (me); + s = me->get_grob_property ("attachment"); + } + 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; - Real gap_f = paper_l ()->get_var ("slur_x_gap"); - - - Direction d=LEFT; - - do + Grob *stem = 0; + if (Note_column::has_interface (sp->get_bound (dir))) { - if (broken_edge_b (d)) + Grob * n =sp->get_bound (dir); + if ((stem = Note_column::stem_l (n))) { - // ugh -- check if needed - dx_f_drul_[d] = -d - *(spanned_drul_[d]->extent (X_AXIS).length () - 0.5 * notewidth_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 (); - // prebreak - if (d == RIGHT) + if (str == "head") { - dx_f_drul_[LEFT] = spanned_drul_[LEFT]->extent (X_AXIS).length (); - - // urg -- check if needed - if (encompass_arr_.size () > 1) - dx_f_drul_[RIGHT] += notewidth_f; + 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)); } - } - /* - normal slur - */ - else if (normal_edge_b (d)) - { - Real notewidth_f = extrema ()[d]->extent (X_AXIS).length (); - dy_f_drul_[d] = (int)rint (extrema ()[d]->stem_l_-> extent (Y_AXIS)[dir_]); - dx_f_drul_[d] += 0.5 * notewidth_f - d * gap_f; - if (dir_ == extrema ()[d]->stem_l_->dir_) + else if (str == "alongside-stem") { - if (dir_ == d) - dx_f_drul_[d] += 0.5 * dir_ * notewidth_f; - else - dx_f_drul_[d] += 0.25 * dir_ * notewidth_f; + o = Offset (0, Stem::chord_start_f (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 + */ + o += Offset (0.5 * + x_extent * (1 + Stem::get_direction (stem)), + 0); } } - else - { - Real notewidth_f = extrema ()[d]->extent (X_AXIS).length (); - dy_f_drul_[d] = (int)rint (extrema ()[d]->head_positions_interval () - [dir_]) * internote_f; - dx_f_drul_[d] += 0.5 * notewidth_f - d * gap_f; - } - dy_f_drul_[d] += dir_ * interline_f; - if (extrema ()[d]->stem_l_ && (dir_ == extrema ()[d]->stem_l_->dir_)) - dy_f_drul_[d] -= dir_ * internote_f; - } - while (flip(&d) != LEFT); + } + /* + 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. - // now that both are set, do dependent - do + Hmm, maybe after-line-breaking should set this to loose-end? */ + else // if (str == "loose-end") { - if (broken_edge_b (d)) - { - Direction u = d; - flip(&u); + SCM other_a = dir == LEFT ? ly_cdr (s) : ly_car (s); + if (ly_symbol2string (other_a) != "loose-end") + o = broken_trend_offset (me, dir); + } - // postbreak - if (d == LEFT) - dy_f_drul_[u] += dir_ * internote_f; + SCM alist = me->get_grob_property ("extremity-offset-alist"); + int stemdir = stem ? Stem::get_direction (stem) : 1; + int slurdir = gh_scm2int (me->get_grob_property ("direction")); + SCM l = scm_assoc + (scm_list_n (a, + gh_int2scm (stemdir * dir), + gh_int2scm (slurdir * dir), + SCM_UNDEFINED), alist); - dy_f_drul_[d] = dy_f_drul_[u]; - } - } - while (flip(&d) != LEFT); + 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; + } /* - Slur should follow line of music + What if get_bound () is not a note-column? */ - if (normal_edge_b (LEFT) - && normal_edge_b (RIGHT) - && (extrema ()[LEFT]->stem_l_ != extrema ()[RIGHT]->stem_l_)) + 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); + } + + Offset off = ly_scm2offset (index_cell (me->get_grob_property + ("attachment-offset"), + dir)) * staff_space; + + off[Y_AXIS] *= Directional_element_interface::get (me); + o += off; + return o; +} + +Offset +Slur::encompass_offset (Grob*me, + Grob* col, + Grob **common) +{ + Offset o; + Grob* stem_l = unsmob_grob (col->get_grob_property ("stem")); + + Direction dir = Directional_element_interface::get (me); + + if (!stem_l) { - Real note_dy = extrema ()[RIGHT]->stem_l_->head_positions ()[dir_] - - extrema ()[LEFT]->stem_l_->head_positions ()[dir_]; - Real dy = dy_f_drul_[RIGHT] - dy_f_drul_[LEFT]; - /* - Should we always follow note-heads, (like a tie)? - For now, only if the note_dy != slur_dy, we'll do - slur_dy := note_dy * factor. - */ - if (sign (dy) != sign (note_dy)) - { - Real damp_f = paper_l ()->get_var ("slur_slope_follow_music_factor"); - Real realdy = note_dy * damp_f; - Direction adjust_dir = (Direction)(- dir_ * sign (realdy)); - if (!adjust_dir) - adjust_dir = -dir_; - /* - adjust only if no beam gets in the way - */ - if (!extrema ()[adjust_dir]->stem_l_->beam_l_ - || (adjust_dir == extrema ()[adjust_dir]->stem_l_->dir_) - || (extrema ()[adjust_dir]->stem_l_->beams_i_drul_[-adjust_dir] < 1)) - { - dy_f_drul_[adjust_dir] = dy_f_drul_[-adjust_dir] - + 2 * adjust_dir * realdy; - Real dx = notewidth_f / 2; - if (adjust_dir != extrema ()[adjust_dir]->stem_l_->dir_) - dx /= 2; - dx_f_drul_[adjust_dir] -= adjust_dir * dx; - } - } + 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); /* - Avoid too steep slurs. + 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]; + } + + /* + leave a gap: slur mustn't touch head/stem */ - Real damp_f = paper_l ()->get_var ("slur_slope_damping"); - Offset d_off = Offset (dx_f_drul_[RIGHT] - dx_f_drul_[LEFT], - dy_f_drul_[RIGHT] - dy_f_drul_[LEFT]); - d_off[X_AXIS] += extent (X_AXIS).length (); - - Real ratio_f = abs (d_off[Y_AXIS] / d_off[X_AXIS]); - if (ratio_f > damp_f) - dy_f_drul_[(Direction)(- dir_ * sign (d_off[Y_AXIS]))] += - dir_ * (ratio_f - damp_f) * d_off[X_AXIS]; + 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_offset_arr (Grob *me) { - Real notewidth = paper_l ()->note_width () * 0.8; - Real gap = paper_l ()->get_var ("slur_x_gap"); + Spanner*sp = dynamic_cast (me); + SCM eltlist = me->get_grob_property ("note-columns"); + Grob *common[] = {me->common_refpoint (eltlist, X_AXIS), + me->common_refpoint (eltlist, Y_AXIS)}; - /* - urg. Calcs done wrt the leftmost note. Fixme. - Calcs ignore possibility of pre/postbreak. + 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; + while (gh_pair_p (eltlist)) + { + encompass_arr.push (unsmob_grob (ly_car (eltlist))); + eltlist =ly_cdr (eltlist); + } + encompass_arr.reverse (); + + 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 */ - Offset left = Offset (dx_f_drul_[LEFT], dy_f_drul_[LEFT]); - left[X_AXIS] += encompass_arr_[0]->stem_l_->hpos_f (); + if (encompass_arr[0] != sp->get_bound (LEFT)) + { + first--; - Real internote = encompass_arr_[0]->stem_l_->staff_line_leading_f ()/2.0; + // ? + offset_arr[0][Y_AXIS] -= + encompass_arr[0]->relative_coordinate (common[Y_AXIS], Y_AXIS) + - me->relative_coordinate (common[Y_AXIS], Y_AXIS); + } /* - - i don't understand these two, but *must* for symmetry - look at encompass array: - lilypond -D input/test/slur-symmetry*.ly - lilypond -D input/test/sleur.ly + right is broken edge + */ + if (encompass_arr.top () != sp->get_bound (RIGHT)) + { + last++; + } - do_post_processing should have calculated these into - dx_f_drul_[], no?? + 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 (dir_ != encompass_arr_[0]->stem_l_->dir_) - left[X_AXIS] += - 0.5 * notewidth * encompass_arr_[0]->stem_l_->dir_ - + gap; - else if (encompass_arr_[0]->stem_l_->dir_ == UP) - left[X_AXIS] -= notewidth; + 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); + } - if ((dir_ == encompass_arr_[0]->stem_l_->dir_) - && (encompass_arr_[0]->stem_l_->dir_ == DOWN)) - left[Y_AXIS] -= internote * encompass_arr_[0]->stem_l_->dir_; - /* */ + return offset_arr; +} - Offset d = Offset (dx_f_drul_[RIGHT] - dx_f_drul_[LEFT], - dy_f_drul_[RIGHT] - dy_f_drul_[LEFT]); - d[X_AXIS] += extent (X_AXIS).length (); - int first = 1; - int last = encompass_arr_.size () - 1; - Array notes; - notes.push (Offset (0,0)); +/* + 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); - // prebreak - if (broken_edge_b (RIGHT)) - last++; - else + 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"))) { - Encompass_info info (encompass_arr_.top (), dir_, this); - d[Y_AXIS] += info.interstaff_f_; + me->suicide (); + return SCM_EOL; } + + Real thick = me->paper_l ()->get_var ("stafflinethickness") * + gh_scm2double (me->get_grob_property ("thickness")); + Bezier one = get_curve (me); + + // 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 = scm_assq (ly_symbol2scm ("height-limit"), details); + SCM r_0_scm = scm_assq (ly_symbol2scm ("ratio"), details); + + Real r_0 = gh_scm2double (ly_cdr (r_0_scm)); + Real h_inf = staff_space * gh_scm2double (ly_cdr (h_inf_scm)); - // postbreak - if (broken_edge_b (LEFT)) + Slur_bezier_bow bb (get_encompass_offset_arr (me), + Directional_element_interface::get (me), + h_inf, r_0); + + if (bb.fit_factor () > 1.0) { - first--; + 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 (); + /* - interstaff postbreak: slur begins at height of last note - */ - Encompass_info info (encompass_arr_[0], dir_, this); - notes[0][Y_AXIS] += info.interstaff_f_; + Slurs that fit beautifully are not ugly + */ + if (area > beautiful) + de_uglyfy (me, &bb, default_height); } - else + + Bezier b = bb.get_bezier (); + + + SCM controls = SCM_EOL; + for (int i= 4; i--;) { - Encompass_info info (encompass_arr_[0], dir_, this); - notes[0][Y_AXIS] += info.interstaff_f_; + 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; + } } - for (int i = first; i < last; i++) + me->set_grob_property ("control-points", controls); +} + +Bezier +Slur::get_curve (Grob*me) +{ + Bezier b; + int i = 0; + + if (!Directional_element_interface::get (me) + || ! gh_symbol_p (index_cell (me->get_grob_property ("attachment"), LEFT)) + || ! gh_symbol_p (index_cell (me->get_grob_property ("attachment"), 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)) { - Encompass_info info (encompass_arr_[i], dir_, this); - notes.push (info.o_ - left); + b.control_[i] = ly_scm2offset (ly_car (s)); + i++; } - /* - interstaff prebreak: slur ends at height of last note - */ - if (broken_edge_b (RIGHT)) - d[Y_AXIS] = notes.top ()[Y_AXIS]; - - notes.push (d); + Array enc (get_encompass_offset_arr (me)); + Direction dir = Directional_element_interface::get (me); - return notes; + 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; } -Array -Slur::get_rods () const +bool +Slur::has_interface (Grob*me) { - Array a; - Rod r; - r.item_l_drul_ = spanned_drul_; - r.distance_f_ = paper_l ()->get_var ("slur_x_minimum"); - - a.push (r); - return a; + return me->has_interface (ly_symbol2scm ("slur-interface")); } +