X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie.cc;h=1899046dc051710c5d8111e7ed98ebd36605d336;hb=26380ed75fbd7b32781715c043dfa5dd96dfbe4a;hp=20b63a8cf99f8399175825e2af617d51b447dfda;hpb=bb446de35e2d24c7f6f15425a76b433cb71a4a1d;p=lilypond.git diff --git a/lily/tie.cc b/lily/tie.cc index 20b63a8cf9..1899046dc0 100644 --- a/lily/tie.cc +++ b/lily/tie.cc @@ -3,171 +3,371 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1999 Han-Wen Nienhuys + (c) 1997--2005 Han-Wen Nienhuys */ -#include "paper-def.hh" #include "tie.hh" + +#include + +#include "spanner.hh" +#include "lookup.hh" +#include "output-def.hh" +#include "rhythmic-head.hh" +#include "bezier.hh" +#include "paper-column.hh" +#include "warn.hh" +#include "staff-symbol-referencer.hh" +#include "directional-element-interface.hh" +#include "bezier.hh" +#include "stem.hh" #include "note-head.hh" -#include "p-col.hh" -#include "debug.hh" +#include "tie-column.hh" + +/* + tie: Connect two noteheads. + + What if we have + + c4 ~ \clef bass ; c4 or + c4 \staffchange c4 + do we have non-horizontal ties then? +*/ + +void +Tie::set_head (Grob *me, Direction d, Grob *h) +{ + assert (!head (me, d)); + index_set_cell (me->get_property ("head-pair"), d, h->self_scm ()); + + dynamic_cast (me)->set_bound (d, h); + me->add_dependency (h); +} void -Tie::set_head (Direction d, Note_head * head_l) +Tie::set_interface (Grob *me) { - assert (!head_l_drul_[d]); - head_l_drul_[d] = head_l; - set_bounds (d, head_l); + me->set_property ("head-pair", scm_cons (SCM_EOL, SCM_EOL)); +} + +Grob * +Tie::head (Grob *me, Direction d) +{ + SCM c = me->get_property ("head-pair"); - add_dependency (head_l); + if (scm_is_pair (c)) + return unsmob_grob (index_get_cell (c, d)); + else + return 0; } -Tie::Tie() +int +Tie::get_column_rank (Grob *me, Direction d) { - head_l_drul_[RIGHT] =0; - head_l_drul_[LEFT] =0; - same_pitch_b_ =false; + Spanner *span = dynamic_cast (me); + Grob *h = head (me, d); + if (!h) + h = span->get_bound (d); + + Grob *col = dynamic_cast (h)->get_column (); + return Paper_column::get_rank (col); } +Real +Tie::get_position (Grob *me) +{ + Direction d = head (me, LEFT) ? LEFT : RIGHT; + return Staff_symbol_referencer::get_position (head (me, d)); +} /* - ugh: direction of the Tie is more complicated. See [Ross] p136 and further - */ -void -Tie::set_default_dir() + Default: Put the tie oppositie of the stem [Wanske p231] + + In case of chords: Tie_column takes over + + The direction of the Tie is more complicated (See [Ross] p136 and + further). + + (what about linebreaks? ) +*/ +Direction +Tie::get_default_dir (Grob *me) { - int m= (head_l_drul_[LEFT]->position_i_ - + head_l_drul_[RIGHT]->position_i_) /2; - dir_ = (m < 0)? DOWN : UP; + Item *sl = head (me, LEFT) ? Rhythmic_head::get_stem (head (me, LEFT)) : 0; + Item *sr = head (me, RIGHT) ? Rhythmic_head::get_stem (head (me, RIGHT)) : 0; + if (sl && sr) + { + if (get_grob_direction (sl) == UP + && get_grob_direction (sr) == UP) + return DOWN; + } + else if (sl || sr) + { + Item *s = sl ? sl : sr; + return -get_grob_direction (s); + } + + return UP; } void -Tie::do_add_processing() +Tie::set_direction (Grob *me) { - if (!(head_l_drul_[LEFT] && head_l_drul_[RIGHT])) - warning (_ ("lonely tie")); - - Direction d = LEFT; - Drul_array new_head_drul = head_l_drul_; - do { - if (!head_l_drul_[d]) - new_head_drul[d] = head_l_drul_[(Direction)-d]; - } while (flip(&d) != LEFT); - head_l_drul_ = new_head_drul; + if (!get_grob_direction (me)) + { + if (Tie_column::has_interface (me->get_parent (Y_AXIS))) + Tie_column::set_directions (me->get_parent (Y_AXIS)); + else + set_grob_direction (me, Tie::get_default_dir (me)); + } } -void -Tie::do_post_processing() +/* + TODO: we should also use thickness for computing the clearance + between head and tie. Very thick ties will now touch the note head. +*/ +SCM +Tie::get_control_points (SCM smob) { - // URG: share code with slur! - assert (head_l_drul_[LEFT] || head_l_drul_[RIGHT]); + Spanner *me = unsmob_spanner (smob); + Direction headdir = CENTER; + if (head (me, LEFT)) + headdir = LEFT; + else if (head (me, RIGHT)) + headdir = RIGHT; + else + { + programming_error ("tie without heads"); + me->suicide (); + return SCM_EOL; + } - // URG - Real notewidth = paper ()->note_width () * 0.8; - Real interline_f = paper ()->interline_f (); + set_direction (me); - /* - [OSU]: slur and tie placement + Direction dir = get_grob_direction (me); - ties: - * x = inner raakpunt - d * gap + Real staff_space = Staff_symbol_referencer::staff_space (me); - * y = length < 5ss : horizontal raakpunt - y = length >= 5ss : y next interline - d * 0.25 ss - --> height <= 5 length ?? we use <= 3 length, now... - */ + Real x_gap_f = robust_scm2double (me->get_property ("x-gap"), 0); - Real gap_f = paper ()->get_var ("slur_x_gap"); + Grob *l = me->get_bound (LEFT); + Grob *r = me->get_bound (RIGHT); - Direction d = LEFT; - do + Grob *commonx = me->common_refpoint (l, X_AXIS); + commonx = me->common_refpoint (r, X_AXIS); + + Real left_x; + + /* + the tie has to be long enough to be visible, but should not go + through key sigs. In the 1.5 series the pref.matter - note + distance is fixed , so this won't be a problem anymore. + */ + Real lambda = 0.9; + + if (Note_head::has_interface (l)) { - dy_f_drul_[d] = .5 * interline_f * (head_l_drul_[d] - ? head_l_drul_[d]->position_i_ - : head_l_drul_[(Direction)-d]->position_i_); + Real where = RIGHT; + + /* + This correction is due te the shape of the black note head. + */ + if (Rhythmic_head::duration_log (l) == 2) + where += dir * 0.2; + left_x = l->extent (l, X_AXIS).linear_combination (where) + + x_gap_f; } - while (flip(&d) != LEFT); + else + left_x = l->extent (l, X_AXIS).linear_combination (lambda); - do + Real width; + if (Note_head::has_interface (l) && Note_head::has_interface (r)) { - // tie attached to outer notehead - if (head_l_drul_[d] && head_l_drul_[d]->extremal_i_) - { - if (d == LEFT) - dx_f_drul_[d] += notewidth; - dx_f_drul_[d] += -d * gap_f; - /* attach to outer 3/4 end of head */ - dy_f_drul_[d] += dir_ * 0.25 * interline_f; - } - // tie attached to inner notehead - else if (head_l_drul_[d] && d == LEFT) - { - dx_f_drul_[d] += -d * notewidth; - } - // uhm? loose end of tie // tie attached to stem + width + = + r->extent (commonx, X_AXIS)[LEFT] + - l->extent (commonx, X_AXIS)[RIGHT] + -2 * x_gap_f; + } + else + { + if (Note_head::has_interface (l)) + width = r->relative_coordinate (commonx, X_AXIS) + - l->extent (commonx, X_AXIS)[RIGHT] + - 2 * x_gap_f; else + width + = -l->extent (commonx, X_AXIS).linear_combination (lambda) + + r->extent (commonx, X_AXIS)[LEFT] + - 2 * x_gap_f; + } + + SCM details = me->get_property ("details"); + + SCM lim // groetjes aan de chirurgendochter. + = scm_assq (ly_symbol2scm ("height-limit"), details); + + Real h_inf = scm_to_double (scm_cdr (lim)) * staff_space; + Real r_0 = scm_to_double (scm_cdr (scm_assq (ly_symbol2scm ("ratio"), details))); + + Bezier b = slur_shape (width, h_inf, r_0); + + /* + I think this better, particularly for small ties. It always allows the user to move ties if + they seem in the wrong place + + TODO: what if 2 heads have different size. + + */ + + Real ypos = Tie::get_position (me) * staff_space / 2 + + dir * scm_to_double (me->get_property ("y-offset"));; + + /* + Make sure we don't start on a dots + */ + if (Note_head::has_interface (l) && Rhythmic_head::get_dots (l)) + { + Grob *dots = Rhythmic_head::get_dots (l); + if (fabs (staff_space * Staff_symbol_referencer::get_position (dots) / 2 + - ypos) < 0.5) { - dx_f_drul_[d] = -d * (spanned_drul_[d]->extent (X_AXIS).length () - -0.5 * notewidth); + ypos += 0.5 * dir; } } - while (flip(&d) != LEFT); - // now that both are set, do dependent - do + /* + todo: prevent ending / staffline collision. + + todo: tie / stem collision + */ + + b = slur_shape (width, h_inf, r_0); + b.scale (1, dir); + b.translate (Offset (left_x, ypos)); + + /* + Avoid colliding of the horizontal part with stafflines. + + + TODO: redo this, heuristic is half-baken, and ties often look ugly + as a result. + + TODO: doesn't work when on staff with even number of lines. + */ + Array horizontal (b.solve_derivative (Offset (1, 0))); + if (horizontal.size ()) { - // tie attached to outer notehead - if (!head_l_drul_[d]) + /* + ugh. Doesnt work for non-horizontal curves. + */ + Real y = b.curve_point (horizontal[0])[Y_AXIS]; + + Real ry = rint (y / staff_space) * staff_space; + Real diff = ry - y; + Real newy = y; + + Real clear = staff_space * scm_to_double (me->get_property ("staffline-clearance")); + + if (fabs (y) + <= Staff_symbol_referencer::staff_radius (me) * staff_space + clear + && fabs (diff) < clear) { - dy_f_drul_[d] = dy_f_drul_[(Direction) -d]; + Real y1 = ry + clear; + Real y2 = ry - clear; + + /* + ugh, we shove the 0.5 out of our sleeves. + + Any way. This test is to make sure that staffline + collision avoidance does not result in completely flat + ties. + */ + if (fabs (y1 - ypos) < 0.5) + y1 = y2; + else if (fabs (y2 - ypos) < 0.5) + y2 = y1; + + newy = (fabs (y1 - y) < fabs (y2 - y)) ? y1 : y2; + + // newy = ry - 0.5 * staff_space * sign (diff) ; + + /* + we don't want horizontal ties + */ + if (fabs (newy - b.control_[0][Y_AXIS]) < 1e-2) + { + newy = newy + dir * staff_space; + } } + + Real y0 = b.control_ [0][Y_AXIS]; + b.control_[2][Y_AXIS] + = b.control_[1][Y_AXIS] + = (b.control_[1][Y_AXIS] - y0) * ((newy - y0) / (y - y0)) + y0; } - while (flip(&d) != LEFT); + else + programming_error ("tie is nowhere horizontal"); - /* - Avoid too steep ties - * slur from notehead to stemend: c''()b'' - */ - Real damp_f = paper ()->get_var ("tie_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 () += extent (X_AXIS).length (); - - Real ratio_f = abs (d_off.y () / d_off.x ()); - if (ratio_f > damp_f) - dy_f_drul_[(Direction)(- dir_ * sign (d_off.y ()))] += - dir_ * (ratio_f - damp_f) * d_off.x (); + SCM controls = SCM_EOL; + for (int i = 4; i--;) + controls = scm_cons (ly_offset2scm (b.control_[i]), controls); + return controls; } -void -Tie::do_substitute_dependency (Score_element*o, Score_element*n) +MAKE_SCHEME_CALLBACK (Tie, print, 1); +SCM +Tie::print (SCM smob) { - Note_head *new_l =n?dynamic_cast (n):0; - if (dynamic_cast (o) == head_l_drul_[LEFT]) - head_l_drul_[LEFT] = new_l; - else if (dynamic_cast (o) == head_l_drul_[RIGHT]) - head_l_drul_[RIGHT] = new_l; -} + Grob *me = unsmob_grob (smob); -#if 0 -Interval -Tie::do_width () const -{ - Real min_f = - Interval width_int = Bow::do_width (); - return width_int.length () < min_f ? Interval (0, min_f) : width_int; -} -#endif + SCM cp = me->get_property ("control-points"); + if (!scm_is_pair (cp)) // list is more accurate + { + cp = get_control_points (smob); + me->set_property ("control-points", cp); + } -Array -Tie::get_rods () const -{ - Array a; - Rod r; - r.item_l_drul_ = spanned_drul_; - r.distance_f_ = paper ()->get_var ("tie_x_minimum"); - a.push (r); - return a; + if (!scm_is_pair (cp)) + return Stencil ().smobbed_copy (); + + + Real staff_thick = Staff_symbol_referencer::line_thickness (me); + Real base_thick = robust_scm2double (me->get_property ("thickness"), 1); + Real thick = base_thick * staff_thick; + + + Bezier b; + int i = 0; + for (SCM s = cp; s != SCM_EOL; s = scm_cdr (s)) + { + b.control_[i] = ly_scm2offset (scm_car (s)); + i++; + } + + Stencil a; + + SCM p = me->get_property ("dash-period"); + SCM f = me->get_property ("dash-fraction"); + if (scm_is_number (p) && scm_is_number (f)) + a = Lookup::dashed_slur (b, + thick, + robust_scm2double (p, 1.0), + robust_scm2double (f, 0)); + else + a = Lookup::slur (b, + get_grob_direction (me) * staff_thick, + thick); + + + return a.smobbed_copy (); } + +ADD_INTERFACE (Tie, + "tie-interface", + "A tie connecting two noteheads.\n", + + "y-offset dash-period dash-fraction " + "staffline-clearance control-points head-pair " + "details thickness x-gap direction minimum-length");