X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur.cc;h=4f71cc62a33add572e182748f1e4f3a84ac45794;hb=aab300b4e582627497ab12f8ea8609f03a3c8d84;hp=6a3d31eaed3506c32559d155124e99423df1fb7b;hpb=e2321f60fb73e9843d07ed9072cdef872ce28f2a;p=lilypond.git diff --git a/lily/slur.cc b/lily/slur.cc index 6a3d31eaed..4f71cc62a3 100644 --- a/lily/slur.cc +++ b/lily/slur.cc @@ -3,18 +3,22 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2003 Han-Wen Nienhuys Jan Nieuwenhuizen */ /* [TODO] - * fix broken interstaff slurs + + * 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) + (along-side-stem) + */ #include "directional-element-interface.hh" @@ -26,7 +30,7 @@ #include "stem.hh" #include "paper-column.hh" #include "molecule.hh" -#include "debug.hh" +#include "warn.hh" #include "slur-bezier-bow.hh" #include "main.hh" #include "group-interface.hh" @@ -35,41 +39,43 @@ void -Slur::set_interface (Score_element*me) +Slur::set_interface (Grob*me) { - me->set_elt_property ("attachment", gh_cons (SCM_BOOL_F, SCM_BOOL_F)); - me->set_interface (ly_symbol2scm ("slur-interface")); + /* Copy to mutable list. */ + me->set_grob_property ("attachment", + ly_deep_copy (me->get_grob_property ("attachment"))); } void -Slur::add_column (Score_element*me, Score_element*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 - { - Pointer_group_interface (me, "note-columns").add_element (n); - me->add_dependency (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); - add_bound_item (dynamic_cast (me), dynamic_cast(n)); + add_bound_item (dynamic_cast (me), dynamic_cast (n)); } void -Slur::de_uglyfy (Score_element*me, Slur_bezier_bow* bb, Real default_height) +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] + 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; - Real c1 = me->paper_l ()->get_var ("bezier_control1"); - Real c2 = me->paper_l ()->get_var ("bezier_control2"); - Real c3 = me->paper_l ()->get_var ("bezier_control3"); + 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; @@ -85,16 +91,18 @@ Slur::de_uglyfy (Score_element*me, Slur_bezier_bow* bb, Real default_height) bb->curve_.assert_sanity (); } + + Direction -Slur::get_default_dir (Score_element*me) +Slur::get_default_dir (Grob*me) { - Link_array encompass_arr = - Pointer_group_interface__extract_elements (me, (Score_element*)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 (Note_column::dir (encompass_arr[i]) < 0) + if (Note_column::dir (encompasses[i]) < 0) { d = UP; break; @@ -104,60 +112,12 @@ Slur::get_default_dir (Score_element*me) } - - - -Offset -Slur::encompass_offset (Score_element*me, - Score_element* col, - Score_element **common) -{ - Offset o; - Score_element* stem_l = unsmob_element (col->get_elt_property ("stem")); - - Direction dir = Directional_element_interface (me).get (); - - if (!stem_l) - { - 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 (stem_l).get (); - o[X_AXIS] = stem_l->relative_coordinate (0, X_AXIS); - - /* - Simply set x to middle of notehead - */ - - o[X_AXIS] -= 0.5 * stem_dir * col->extent (X_AXIS).length (); - - if ((stem_dir == dir) - && !stem_l->extent (Y_AXIS).empty_b ()) - { - o[Y_AXIS] = stem_l->relative_coordinate (common[Y_AXIS], Y_AXIS); // iuhg - o[Y_AXIS] += stem_l->extent (Y_AXIS)[dir]; - } - else - { - o[Y_AXIS] = col->relative_coordinate (common[Y_AXIS], Y_AXIS); // ugh - o[Y_AXIS] += col->extent (Y_AXIS)[dir]; - } - - /* - leave a gap: slur mustn't touch head/stem - */ - o[Y_AXIS] += dir * me->paper_l ()->get_var ("slur_y_free"); - return o; -} - -MAKE_SCHEME_CALLBACK (Slur, after_line_breaking); +MAKE_SCHEME_CALLBACK (Slur, after_line_breaking,1); SCM Slur::after_line_breaking (SCM smob) { - Score_element *me = unsmob_element (smob); - if (!gh_scm2int(scm_length (me->get_elt_property ("note-columns")))) + Grob *me = unsmob_grob (smob); + if (!scm_ilength (me->get_grob_property ("note-columns"))) { me->suicide (); return SCM_UNSPECIFIED; @@ -167,74 +127,222 @@ Slur::after_line_breaking (SCM smob) return SCM_UNSPECIFIED; } + void -Slur::set_extremities (Score_element*me) +Slur::check_slope (Grob *me) { - if (!Directional_element_interface (me).get ()) - Directional_element_interface (me).set (get_default_dir (me)); + /* + 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); + + 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]))); + } + } + +} + +/* + Set 'attachment grob property, and return it. +*/ +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_cell (me->get_elt_property ("attachment"), dir))) + + if (!gh_symbol_p (index_get_cell (att, dir))) { - - // for (SCM s = get_elt_property ("slur-extremity-rules"); s != SCM_EOL; s = gh_cdr (s)) - for (SCM s = scm_eval (ly_symbol2scm ("slur-extremity-rules")); - s != SCM_EOL; s = gh_cdr (s)) + for (SCM s = me->get_grob_property ("extremity-rules"); + s != SCM_EOL; s = ly_cdr (s)) { - SCM r = gh_call2 (gh_caar (s), me->self_scm (), + SCM r = gh_call2 (ly_caar (s), me->self_scm (), gh_int2scm ((int)dir)); if (r != SCM_BOOL_F) { - index_set_cell (me->get_elt_property ("attachment"), dir, - gh_cdar (s)); + 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) +{ + SCM cols = me->get_grob_property ("note-columns"); + + if(!gh_pair_p (cols)) + { + 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_)) + { + for (int i = dir == LEFT ? 0 : mother->broken_intos_.size () - 1; + dir == LEFT ? i < mother->broken_intos_.size () : i > 0; + dir == LEFT ? i++ : i--) + { + if (mother->broken_intos_[i - dir] == me) + { + 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; + } + } + } + return o; } +/* + COMMON is size-2 array with common refpoints. + +UGH: this routine delivers offsets which are *not* relative to COMMON. +*/ Offset -Slur::get_attachment (Score_element*me,Direction dir, - Score_element **common) +Slur::get_attachment (Grob *me, Direction dir, + Grob **common) { - Spanner*sp = dynamic_cast(me); - SCM s = me->get_elt_property ("attachment"); - SCM a = dir == LEFT ? gh_car (s) : gh_cdr (s); + 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 ss = Staff_symbol_referencer::staff_space ((Score_element*)me); - Real hs = ss / 2.0; + Real staff_space = Staff_symbol_referencer::staff_space ((Grob*)me); + Real hs = staff_space / 2.0; Offset o; - Score_element *stem = 0; + int slurdir = gh_scm2int (me->get_grob_property ("direction")); + + Grob *stem = 0; if (Note_column::has_interface (sp->get_bound (dir))) { - Score_element * n =sp->get_bound (dir); - if (Score_element *stem = Note_column::stem_l (n)) + Grob * n =sp->get_bound (dir); + if ((stem = Note_column::get_stem (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 (me).get ()] * hs); + [Directional_element_interface::get (me)] * hs); /* Default position is centered in X, on outer side of head Y */ - o += Offset (0.5 * n->extent (X_AXIS).length (), - 0.5 * ss * Directional_element_interface (me).get ()); + 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_f (stem)); + o = Offset (0, Stem::chord_start_y (stem)); /* Default position is on stem X, on outer side of head Y */ - o += Offset (n->extent (X_AXIS).length () - * (1 + Stem::get_direction (stem)), - 0.5 * ss * Directional_element_interface (me).get ()); + o += Offset (x_extent * (1 + Stem::get_direction (stem)), + 0.5 * staff_space + * Directional_element_interface::get (me)); } else if (str == "stem") { @@ -242,33 +350,44 @@ Slur::get_attachment (Score_element*me,Direction dir, /* Default position is on stem X, at stem end Y */ + Real stem_thickness = + gh_scm2double (stem->get_grob_property ("thickness")) + * stem->get_paper ()->get_var ("linethickness"); o += Offset (0.5 * - (n->extent (X_AXIS).length () - - stem->extent (X_AXIS).length ()) - * (1 + Stem::get_direction (stem)), - 0); + x_extent * (1 + Stem::get_direction (stem)) + - ((dir + 1)/2) * stem_thickness + + ((1 - slurdir)/2) * stem_thickness, + 0); } } } - else if (str == "loose-end") + /* + 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 ? gh_cdr (s) : gh_car (s); + SCM other_a = dir == LEFT ? ly_cdr (s) : ly_car (s); if (ly_symbol2string (other_a) != "loose-end") - { - o = Offset (0, get_attachment (me, -dir, common)[Y_AXIS]); - } + o = broken_trend_offset (me, dir); } - + + SCM alist = me->get_grob_property ("extremity-offset-alist"); + int stemdir = stem ? Stem::get_direction (stem) : 1; SCM l = scm_assoc - (scm_listify (a, - gh_int2scm (stem ? Stem::get_direction (stem) : 1 * dir), - gh_int2scm (Directional_element_interface (me).get () * dir), - SCM_UNDEFINED), - scm_eval (ly_symbol2scm ("slur-extremity-offset-alist"))); - + (scm_list_n (a, + gh_int2scm (stemdir * dir), + gh_int2scm (slurdir * dir), + SCM_UNDEFINED), alist); + if (l != SCM_BOOL_F) { - o += ly_scm2offset (gh_cdr (l)) * ss * dir; + Offset off = ly_scm2offset (ly_cdr (l)) * staff_space; + off[X_AXIS] *= dir; + off[Y_AXIS] *= Directional_element_interface::get (me); + o += off; } /* @@ -281,153 +400,214 @@ Slur::get_attachment (Score_element*me,Direction dir, - me->relative_coordinate (common[Y_AXIS], Y_AXIS); } + 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; } -Array -Slur::get_encompass_offset_arr (Score_element*me) +Offset +Slur::encompass_offset (Grob*me, + Grob* col, + Grob **common) { - Spanner*sp = dynamic_cast(me); - SCM eltlist = me->get_elt_property ("note-columns"); - Score_element *common[] = {me->common_refpoint (eltlist,X_AXIS), - me->common_refpoint (eltlist,Y_AXIS)}; + 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); + /* + 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; - 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)) + if ((stem_dir == dir) + && !stem->extent (stem, Y_AXIS).empty_b ()) + { + o[Y_AXIS] = stem->extent (common[Y_AXIS], Y_AXIS)[dir]; + } + else { - encompass_arr.push (unsmob_element (gh_car (eltlist))); - eltlist =gh_cdr (eltlist); + o[Y_AXIS] = col->extent (common[Y_AXIS], Y_AXIS)[dir]; } - encompass_arr.reverse (); + /* + 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_offsets (Grob *me) +{ + 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); - Array offset_arr; + 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 (get_attachment (me, LEFT, common)); + offsets.push (get_attachment (me, LEFT, common)); /* left is broken edge */ - - if (encompass_arr[0] != sp->get_bound (LEFT)) + if (encompasses[0] != sp->get_bound (LEFT)) { first--; // ? - offset_arr[0][Y_AXIS] -= - encompass_arr[0]->relative_coordinate (common[Y_AXIS], Y_AXIS) + 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 () != sp->get_bound (RIGHT)) + if (encompasses.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 o (encompass_offset (me, encompasses[i], common)); + offsets.push (o - origin); } - offset_arr.push (Offset (sp->spanner_length (), 0) + get_attachment (me, RIGHT,common)); + offsets.push (Offset (sp->spanner_length (), 0) + get_attachment (me, RIGHT,common)); - if (encompass_arr[0] != sp->get_bound (LEFT)) + if (encompasses[0] != sp->get_bound (LEFT)) { - offset_arr.top ()[Y_AXIS] -= encompass_arr.top ()->relative_coordinate (common[Y_AXIS], Y_AXIS) + offsets.top ()[Y_AXIS] -= encompasses.top ()->relative_coordinate (common[Y_AXIS], Y_AXIS) - me->relative_coordinate (common[Y_AXIS], Y_AXIS); } - return offset_arr; + return offsets; } -MAKE_SCHEME_CALLBACK(Slur,set_spacing_rods); + + +/* + ugh ? + */ +MAKE_SCHEME_CALLBACK (Slur, height, 2); SCM -Slur::set_spacing_rods (SCM smob) +Slur::height (SCM smob, SCM ax) { - Score_element*me = unsmob_element (smob); - - Rod r; - Spanner*sp = dynamic_cast(me); - r.item_l_drul_[LEFT] = sp->get_bound (LEFT); - r.item_l_drul_[RIGHT] = sp->get_bound (RIGHT); - r.distance_f_ = - gh_scm2double (me->get_elt_property ("minimum-length")) - * me->paper_l ()->get_var ("staffspace"); + Axis a = (Axis)gh_scm2int (ax); + Grob * me = unsmob_grob (smob); + assert (a == Y_AXIS); - r.add_to_cols (); - return SCM_UNSPECIFIED; + 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); +MAKE_SCHEME_CALLBACK (Slur, brew_molecule,1); SCM Slur::brew_molecule (SCM smob) { - Score_element * me = unsmob_element (smob); - if (!gh_scm2int(scm_length (me->get_elt_property ("note-columns")))) + Grob * me = unsmob_grob (smob); + if (!scm_ilength (me->get_grob_property ("note-columns"))) { me->suicide (); return SCM_EOL; } - Real thick = me->paper_l ()->get_var ("stafflinethickness") * - gh_scm2double (me->get_elt_property ("thickness")); + Real thick = me->get_paper ()->get_var ("linethickness") * + 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_elt_property ("dashed"); + SCM d = me->get_grob_property ("dashed"); if (gh_number_p (d)) - a = me->lookup_l ()->dashed_slur (one, thick, thick * gh_scm2double (d)); + a = Lookup::dashed_slur (one, thick, thick * gh_scm2double (d)); else - a = me->lookup_l ()->slur (one, Directional_element_interface (me).get () * thick, thick); + a = Lookup::slur (one, Directional_element_interface::get (me) * thick, thick); - return a.create_scheme(); + return a.smobbed_copy (); } void -Slur::set_control_points (Score_element*me) +Slur::set_control_points (Grob*me) { - Real staff_space = Staff_symbol_referencer::staff_space ((Score_element*)me); - Real h_inf = me->paper_l ()->get_var ("slur_height_limit_factor") * - staff_space; - Real r_0 = me->paper_l ()->get_var ("slur_ratio"); + 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_offset_arr (me), - Directional_element_interface (me).get (), + 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); - bb.minimise_enclosed_area (me->paper_l()); - - Real bff = me->paper_l ()->get_var ("slur_force_blowfit"); + + 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 sb = me->paper_l ()->get_var ("slur_beautiful"); + Real beautiful = length * default_height * sb; - Real area = bb.enclosed_area_f (); + Real area = bb.get_enclosed_area (); /* Slurs that fit beautifully are not ugly @@ -442,39 +622,52 @@ Slur::set_control_points (Score_element*me) SCM controls = SCM_EOL; for (int i= 4; i--;) { - controls = gh_cons ( ly_offset2scm (b.control_[i]), controls); + 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 (); + { + me->suicide (); + return; + } } - me->set_elt_property ("control-points", controls); + me->set_grob_property ("control-points", controls); } Bezier -Slur::get_curve (Score_element*me) +Slur::get_curve (Grob*me) { Bezier b; int i = 0; - if (!Directional_element_interface (me).get () - || ! gh_symbol_p (index_cell (me->get_elt_property ("attachment"), LEFT))) + 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_elt_property ("control-points"))) + if (!gh_pair_p (me->get_grob_property ("control-points"))) set_control_points (me); - for (SCM s= me->get_elt_property ("control-points"); s != SCM_EOL; s = gh_cdr (s)) + // 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 (gh_car (s)); + b.control_[i] = ly_scm2offset (ly_car (s)); i++; } - Array enc (get_encompass_offset_arr (me)); - Direction dir = Directional_element_interface (me).get (); + 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]; @@ -486,7 +679,7 @@ Slur::get_curve (Score_element*me) if (x > x1 && x ? dir * (enc[i][Y_AXIS] - y); + off = off >? dir * (enc[i][Y_AXIS] - y); } } b.translate (Offset (0, dir * off)); @@ -494,10 +687,9 @@ Slur::get_curve (Score_element*me) } -bool -Slur::has_interface (Score_element*me) -{ - return me->has_interface (ly_symbol2scm ("slur-interface")); -} +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"); +