X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=inline;f=lily%2Fslur.cc;h=d48c91d7b64b8cc4f1a54eaa044548e1e88b28d6;hb=6bf1606d827527f02953add0988a4fbbf0dc0c4e;hp=349dbd34d17f75744d1a6c8df8c5cbb7b9867001;hpb=2873636a53f0011f837aaf6e2072de602730d957;p=lilypond.git diff --git a/lily/slur.cc b/lily/slur.cc index 349dbd34d1..d48c91d7b6 100644 --- a/lily/slur.cc +++ b/lily/slur.cc @@ -3,18 +3,22 @@ source file of the GNU LilyPond music typesetter - (c) 1996, 1997--1999 Han-Wen Nienhuys + (c) 1996--2001 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" +#include "group-interface.hh" #include "slur.hh" - #include "lookup.hh" #include "paper-def.hh" #include "note-column.hh" @@ -22,34 +26,78 @@ #include "paper-column.hh" #include "molecule.hh" #include "debug.hh" -#include "box.hh" -#include "bezier.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) { + /* 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 (!n->head_l_arr_.size ()) + if (!gh_pair_p (n->get_grob_property ("note-heads"))) warning (_ ("Putting slur over rest. Ignoring.")); else { - encompass_arr_.push (n); - add_dependency (n); + Pointer_group_interface::add_element (me, "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++) + { + 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 (gh_car (up)); + Real c2 = gh_scm2double (gh_cadr (up)); + Real c3 = gh_scm2double (gh_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_elements (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; @@ -58,456 +106,553 @@ Slur::get_default_dir () const return d; } -void -Slur::do_add_processing () -{ - 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; +} + void -Slur::do_substitute_element_pointer (Score_element*o, Score_element*n) +Slur::check_slope (Grob *me) { - int i; - while ((i = encompass_arr_.find_i (dynamic_cast (o))) >=0) + /* + Avoid too steep slurs. + */ + SCM s = me->get_grob_property ("slope-limit"); + if (gh_number_p (s)) { - if (n) - encompass_arr_[i] = dynamic_cast (n); - else - encompass_arr_.del (i); + 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]))); + } } } -static int -Note_column_compare (Note_column *const&n1 , Note_column* const&n2) +void +Slur::set_extremities (Grob *me) { - return Item::left_right_compare (n1, n2); -} + if (!Directional_element_interface::get (me)) + Directional_element_interface::set (me, get_default_dir (me)); - -Offset -Slur::encompass_offset (Note_column const* col) const -{ - Offset o; - Stem* stem_l = col->stem_l_; - if (!stem_l) + Direction dir = LEFT; + do { - warning (_ ("Slur over rest?")); - o[X_AXIS] = col->hpos_f (); - o[Y_AXIS] = col->extent (Y_AXIS)[dir_]; - return o; + if (!gh_symbol_p (index_cell (me->get_grob_property ("attachment"), dir))) + { + for (SCM s = me->get_grob_property ("extremity-rules"); + s != SCM_EOL; s = gh_cdr (s)) + { + SCM r = gh_call2 (gh_caar (s), me->self_scm (), + gh_int2scm ((int)dir)); + if (r != SCM_BOOL_F) + { + index_set_cell (me->get_grob_property ("attachment"), dir, + gh_cdar (s)); + break; + } + } + } } - - o[X_AXIS] = stem_l->hpos_f (); + while (flip (&dir) != LEFT); - /* - Simply set x to middle of notehead - */ + check_slope (me); +} - o[X_AXIS] -= 0.5 * stem_l->dir_ * col->extent (X_AXIS).length (); - if ((stem_l->dir_ == dir_) - && !stem_l->extent (Y_AXIS).empty_b ()) +Real +Slur::get_first_notecolumn_y (Grob *me, Direction dir) +{ + Grob *col = dir == LEFT + ? unsmob_grob (gh_car (scm_reverse (me->get_grob_property + ("note-columns")))) + : unsmob_grob + (gh_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)) { - o[Y_AXIS] = stem_l->extent (Y_AXIS)[dir_]; + y = get_attachment (me, dir, common)[Y_AXIS]; } else { - o[Y_AXIS] = col->extent (Y_AXIS)[dir_]; + 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) +{ /* - 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); + 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; } -/* - ARGRARGRARGRARGAR! - - Fixme - */ -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 (); - - /* - 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 interline_f = paper_l ()->get_var ("interline"); - Real internote_f = interline_f / 2; - - 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 d = LEFT; - do + SCM s = me->get_grob_property ("attachment"); + if (!gh_symbol_p (index_cell (s, dir))) { - dx_f_drul_[d] = dy_f_drul_[d] = 0; - if ((note_column_drul[d] == spanned_drul_[d]) - && note_column_drul[d]->head_l_arr_.size () - && (note_column_drul[d]->stem_l_)) + set_extremities (me); + s = me->get_grob_property ("attachment"); + } + SCM a = dir == LEFT ? gh_car (s) : gh_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; + + 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))) { - 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->dir_ == dir_) && (dir_ != d))) - && !((dir_ == stem_l->dir_) - && stem_l->beam_l_ && (stem_l->beams_i_drul_[-d] >= 1))) - { - dx_f_drul_[d] = spanned_drul_[d]->extent (X_AXIS).length () / 2; - dx_f_drul_[d] -= d * x_gap_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 (stem_l->dir_ != dir_) - { - dy_f_drul_[d] = note_column_drul[d]->extent (Y_AXIS)[dir_]; - } - else - { - dy_f_drul_[d] = stem_l->chord_start_f () - + dir_ * internote_f; - } - dy_f_drul_[d] += dir_ * y_gap_f; + 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)); } - /* - side attached to (visible) stem - */ - else + else if (str == "alongside-stem") { - dx_f_drul_[d] = stem_l->hpos_f () - - spanned_drul_[d]->relative_coordinate (0, X_AXIS); + o = Offset (0, Stem::chord_start_f (stem)); /* - side attached to beamed stem + Default position is on stem X, on outer side of head Y */ - if (stem_l->beam_l_ && (stem_l->beams_i_drul_[-d] >= 1)) - { - dy_f_drul_[d] = stem_l->extent (Y_AXIS)[dir_]; - dy_f_drul_[d] += dir_ * 2 * y_gap_f; - } + 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); /* - side attached to notehead, with stem getting in the way + Default position is on stem X, at stem end Y */ - else - { - dx_f_drul_[d] -= d * x_gap_f; - - dy_f_drul_[d] = stem_l->chord_start_f () - + dir_ * internote_f; - dy_f_drul_[d] += dir_ * y_gap_f; - } + o += Offset (0.5 * + x_extent * (1 + Stem::get_direction (stem)), + 0); } } - /* - 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); - - int cross_count = cross_staff_count (); - bool interstaff_b = (0 < cross_count) && (cross_count < encompass_arr_.size ()); - - Drul_array info_drul; - Drul_array interstaff_interval; + /* + 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. - do + Hmm, maybe after-line-breaking should set this to loose-end? */ + else // if (str == "loose-end") { - info_drul[d] = encompass_offset (encompass_arr_.boundary (d, 0)); - interstaff_interval[d] = calc_interstaff_dist (encompass_arr_.boundary (d,0), - this); + SCM other_a = dir == LEFT ? gh_cdr (s) : gh_car (s); + if (ly_symbol2string (other_a) != "loose-end") + o = broken_trend_offset (me, dir); } - while (flip (&d) != LEFT); - - Real interstaff_f = interstaff_interval[RIGHT] - interstaff_interval[LEFT]; - if (fix_broken_b) + 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); + + if (l != SCM_BOOL_F) { - Direction d = (encompass_arr_.top () != spanned_drul_[RIGHT]) ? - RIGHT : LEFT; - dy_f_drul_[d] = info_drul[d][Y_AXIS]; - if (!interstaff_b) - { - dy_f_drul_[d] -= interstaff_interval[d]; - if (cross_count) // interstaff_i ? - { - dy_f_drul_[LEFT] += interstaff_interval[d]; - dy_f_drul_[RIGHT] += interstaff_interval[d]; - } - } + Offset off = ly_scm2offset (gh_cdr (l)) * staff_space; + off[X_AXIS] *= dir; + off[Y_AXIS] *= Directional_element_interface::get (me); + o += off; } - /* - Now we've got a fine slur - Catch and correct some ugly cases + What if get_bound () is not a note-column? */ - 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 (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); + } - if (!fix_broken_b) - dy_f_drul_[RIGHT] += interstaff_f; + Offset off = ly_scm2offset (index_cell (me->get_grob_property + ("attachment-offset"), + dir)) * staff_space; - Real dy_f = dy_f_drul_[RIGHT] - dy_f_drul_[LEFT]; - if (!fix_broken_b) - dy_f -= interstaff_f; - Real dx_f = do_width ().length () + dx_f_drul_[RIGHT] - dx_f_drul_[LEFT]; + off[Y_AXIS] *= Directional_element_interface::get (me); + o += off; + return o; +} - /* - Avoid too steep slurs. - */ - Real slope_ratio_f = abs (dy_f / dx_f); - if (slope_ratio_f > slope_damp_f) +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) { - Direction d = (Direction)(- 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 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 high slurs - - Wierd slurs may look a lot better after they have been - adjusted a bit. - So, we'll do this in 3 steps + Simply set x to middle of notehead */ - for (int i = 0; i < 3; i++) - { - Drul_array curve_xy_drul = curve_extent_drul (); - Real height_f = curve_xy_drul[Y].length (); - Real width_f = curve_xy_drul[X].length (); - - dy_f = dy_f_drul_[RIGHT] - dy_f_drul_[LEFT]; - if (!fix_broken_b) - dy_f -= interstaff_f; + 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; - Real height_ratio_f = abs (height_f / width_f); - if (height_ratio_f > height_damp_f) - { - Direction d = (Direction)(- 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) - { - dy_f_drul_[-d] += dir_ * damp_f; - dy_f_drul_[d] += dir_ * damp_f; - } - /* - don't change slope too much, would have been catched by slope damping - */ - else - { - damp_f = damp_f extent (stem_l, Y_AXIS).empty_b ()) + { + o[Y_AXIS] = stem_l->extent (common[Y_AXIS], Y_AXIS)[dir]; } - - /* - 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 + else { - Note_column * nc = note_column_drul[d]; - if (nc == spanned_drul_[d] - && nc->stem_l_ - && nc->stem_l_->dir_ == dir_ - && abs (nc->stem_l_->extent (Y_AXIS)[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)[dir_] - + interstaff_interval[d] - + dir_ * 2 * y_gap_f; - - snapped_b_drul[d] = true; - } + o[Y_AXIS] = col->extent (common[Y_AXIS], Y_AXIS)[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; - - - /* - (sigh) - - More refactoring could be done. + leave a gap: slur mustn't touch head/stem */ - 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; - } - 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); + o[Y_AXIS] += dir * gh_scm2double (me->get_grob_property ("y-free")) * + 1.0; + return o; } - -int -Slur::cross_staff_count ()const +Array +Slur::get_encompass_offset_arr (Grob *me) { - int k=0; + 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)}; - for (int i = 0; i < encompass_arr_.size (); i++) + + 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 (calc_interstaff_dist (encompass_arr_[i], this)) - k++; + encompass_arr.push (unsmob_grob (gh_car (eltlist))); + eltlist =gh_cdr (eltlist); } - return k; -} - + encompass_arr.reverse (); -Array -Slur::get_encompass_offset_arr () const -{ - 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 - Offset origin (relative_coordinate (0, X_AXIS), 0); + 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; + int last = encompass_arr.size () - 2; - offset_arr.push (Offset (dx_f_drul_[LEFT], dy_f_drul_[LEFT])); + offset_arr.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 (encompass_arr[0] != sp->get_bound (LEFT)) { first--; - Real is = calc_interstaff_dist (encompass_arr_[0], this); - if (cross_b) - offset_arr[0][Y_AXIS] += is; + + // ? + 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 () != spanned_drul_[RIGHT]) + if (encompass_arr.top () != sp->get_bound (RIGHT)) { last++; } for (int i = first; i <= last; i++) { - Offset o (encompass_offset (encompass_arr_[i])); + Offset o (encompass_offset (me, encompass_arr[i], common)); offset_arr.push (o - origin); } - offset_arr.push (Offset (do_width ().length () + dx_f_drul_[RIGHT], - dy_f_drul_[RIGHT])); + 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; } -Array -Slur::get_rods () const + + +/* + ugh ? + */ +MAKE_SCHEME_CALLBACK (Slur, height, 2); +SCM +Slur::height (SCM smob, SCM ax) { - Array a; - Rod r; - r.item_l_drul_ = spanned_drul_; - r.distance_f_ = paper_l ()->get_var ("slur_x_minimum"); + Axis a = (Axis)gh_scm2int (ax); + Grob * me = unsmob_grob (smob); + assert (a == Y_AXIS); - a.push (r); - return a; + 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; + } + + 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 (gh_cdr (r_0_scm)); + Real h_inf = staff_space * gh_scm2double (gh_cdr (h_inf_scm)); + + Slur_bezier_bow bb (get_encompass_offset_arr (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 (gh_cdr (sbf))) + bff = gh_scm2double (gh_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 (); + + + 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; + } + } + + 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 = gh_cdr (s)) + { + b.control_[i] = ly_scm2offset (gh_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]; + + 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; +} + + +bool +Slur::has_interface (Grob*me) +{ + return me->has_interface (ly_symbol2scm ("slur-interface")); }