X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Ftie.cc;h=2dea2b88467b2182386ab7ffd454fac25d372cf1;hb=ee9d99190ecd2a054322eabca66b1e0c2507474f;hp=9fe73f7d9ee9a9792e104fc459ead924b3d282a8;hpb=95de6911a5cd1f90dfcd72ec798f089f6522f50f;p=lilypond.git diff --git a/lily/tie.cc b/lily/tie.cc index 9fe73f7d9e..2dea2b8846 100644 --- a/lily/tie.cc +++ b/lily/tie.cc @@ -3,144 +3,311 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1998 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ +#include + +#include "spanner.hh" +#include "lookup.hh" #include "paper-def.hh" #include "tie.hh" -#include "note-head.hh" -#include "p-col.hh" +#include "rhythmic-head.hh" +#include "bezier.hh" +#include "paper-column.hh" #include "debug.hh" -#include "main.hh" // experimental features +#include "staff-symbol-referencer.hh" +#include "directional-element-interface.hh" +#include "molecule.hh" +#include "bezier-bow.hh" +#include "stem.hh" +#include "note-head.hh" + +/* + tie: Connect two noteheads. + + What if we have + + c4 ~ \clef bass ; c4 or + + c4 \staffchange c4 + + do we have non-horizontal ties then? + */ -IMPLEMENT_IS_TYPE_B1(Tie,Bow); void -Tie::set_head (Direction d, Note_head * head_l) +Tie::set_head (Grob*me,Direction d, Item * head_l) { - assert (!head_l_drul_[d]); - head_l_drul_[d] = head_l; - set_bounds (d, head_l); - - add_dependency (head_l); + assert (!head (me,d)); + index_set_cell (me->get_grob_property ("heads"), d, head_l->self_scm ()); + + dynamic_cast (me)->set_bound (d, head_l); + me->add_dependency (head_l); } -Tie::Tie() +void +Tie::set_interface (Grob*me) { - head_l_drul_[RIGHT] =0; - head_l_drul_[LEFT] =0; - same_pitch_b_ =false; + me->set_grob_property ("heads", gh_cons (SCM_EOL, SCM_EOL)); + me->set_interface (ly_symbol2scm ("tie-interface")); } - -/* - ugh: direction of the Tie is more complicated. See [Ross] p136 and further - */ -void -Tie::set_default_dir() +bool +Tie::has_interface (Grob*me) { - int m= (head_l_drul_[LEFT]->position_i_ - + head_l_drul_[RIGHT]->position_i_) /2; - dir_ = (m < 0)? DOWN : UP; + return me->has_interface (ly_symbol2scm ("tie-interface")); } -void -Tie::do_add_processing() +Grob* +Tie::head (Grob*me, Direction d) { - 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; + SCM c = me->get_grob_property ("heads"); + c = index_cell (c, d); + + return unsmob_grob (c); } -void -Tie::do_post_processing() +Real +Tie::position_f (Grob*me) { - assert (head_l_drul_[LEFT] || head_l_drul_[RIGHT]); + Direction d = head (me,LEFT) ? LEFT:RIGHT; + return Staff_symbol_referencer::position_f (head (me,d)); +} + - Real notewidth = paper ()->note_width (); - Real interline_f = paper ()->interline_f (); - Real tie_min = paper ()->get_var ("tie_x_minimum"); +/* + Default: Put the tie oppositie of the stem [Wanske p231] - /* - [OSU]: slur and tie placement + In case of chords: Tie_column takes over + + The direction of the Tie is more complicated (See [Ross] p136 and + further). +*/ +Direction +Tie::get_default_dir (Grob*me) +{ + Item * sl = head (me,LEFT) ? Rhythmic_head::stem_l (head (me,LEFT)) :0; + Item * sr = head (me,RIGHT) ? Rhythmic_head::stem_l (head (me,RIGHT)) :0; - ties: - * x = inner raakpunt - d * gap + if (sl && sr) + { + if (Directional_element_interface::get (sl) == UP + && Directional_element_interface::get (sr) == UP) + return DOWN; + } + else if (sl || sr) + { + Item *s = sl ? sl : sr; + return - Directional_element_interface::get (s); + } - * y = length < 5ss : horizontal raakpunt - y = length >= 5ss : y next interline - d * 0.25 ss - --> height <= 5 length ?? we use <= 3 length, now... - */ + + return UP; +} - Real gap_f = paper ()->get_var ("slur_x_gap"); - Direction d = LEFT; - do +SCM +Tie::get_control_points (SCM smob) +{ + Spanner*me = unsmob_spanner (smob); + Direction headdir = CENTER; + if (head (me,LEFT)) + headdir = LEFT; + else if (head (me,RIGHT)) + headdir = RIGHT; + else { - dy_f_drul_[d] = .5 * interline_f * (head_l_drul_[d] - ? head_l_drul_[d]->position_i_ - : head_l_drul_[(Direction)-d]->position_i_); + programming_error ("Tie without heads."); + me->suicide (); + return SCM_UNSPECIFIED; } - while (flip(&d) != LEFT); + + if (!Directional_element_interface::get (me)) + Directional_element_interface::set (me, Tie::get_default_dir (me)); + + Real staff_space = Staff_symbol_referencer::staff_space (me); + + Real x_gap_f = gh_scm2double (me->get_grob_property ("x-gap")); - do + Grob* l = me->get_bound (LEFT); + Grob* r = me->get_bound (RIGHT); + + Grob* commonx = me->common_refpoint (l, X_AXIS); + commonx = me->common_refpoint (r, X_AXIS); + + Real left_x; + + /* + this is a kludge: the tie has to be long enough to be + visible, but should not go through key sigs. + + (please fixme) + */ + Real lambda = 0.5; + + if (Note_head::has_interface (l)) + left_x = l->extent (l, X_AXIS)[RIGHT] + x_gap_f; + else + left_x = l->extent (l, X_AXIS).linear_combination (lambda); + + + 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]) - { - dx_f_drul_[d] += d*0.5 * 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; + } + + Direction dir = Directional_element_interface::get (me); + + SCM details = me->get_grob_property ("details"); + + SCM lim // groetjes aan de chirurgendochter. + = scm_assq (ly_symbol2scm ("height-limit"),details); + + Real h_inf = gh_scm2double (ly_cdr (lim)) * staff_space; + Real r_0 = gh_scm2double (ly_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::position_f (me) * staff_space/2 + + dir * gh_scm2double (me->get_grob_property ("y-offset"));; + + /* + Make sure we don't start on a dots + */ + if (Note_head::has_interface (l) && Rhythmic_head::dots_l (l)) + { + Grob* dots = Rhythmic_head::dots_l(l); + if(fabs (staff_space * Staff_symbol_referencer::position_f (dots) /2 + - ypos) < 0.5) { - dx_f_drul_[d] = -d * (spanned_drul_[d]->width ().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 * gh_scm2double (me->get_grob_property ("staffline-clearance")); + + if (fabs (y) <= Staff_symbol_referencer::staff_radius (me) + && fabs (diff) < clear) { - if (dx_f_drul_[RIGHT] - dx_f_drul_[LEFT] < tie_min) + Real y1 = ry + clear; + Real y2 = ry - clear; + + 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) { - dx_f_drul_[d] -= d * tie_min - - (dx_f_drul_[RIGHT] - dx_f_drul_[LEFT]); - dx_f_drul_[d] = dx_f_drul_[(Direction)-d] + d * tie_min; + newy = newy + dir * staff_space; } - - dy_f_drul_[d] = dy_f_drul_[(Direction) -d]; } + + 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"); + + + + SCM controls = SCM_EOL; + for (int i= 4; i--;) + controls = gh_cons (ly_offset2scm (b.control_[i]), controls); + return controls; } -void -Tie::do_substitute_dependency (Score_elem*o, Score_elem*n) + +MAKE_SCHEME_CALLBACK (Tie,brew_molecule,1); +SCM +Tie::brew_molecule (SCM smob) { - Note_head *new_l =n?(Note_head*)n->item():0; - if (o->item() == head_l_drul_[LEFT]) - head_l_drul_[LEFT] = new_l; - else if (o->item() == head_l_drul_[RIGHT]) - head_l_drul_[RIGHT] = new_l; + Grob*me = unsmob_grob (smob); + + SCM cp = me->get_grob_property ("control-points"); + if (cp == SCM_EOL) + { + cp = get_control_points (smob); + me->set_grob_property ("control-points", cp); + } + + Real thick = + gh_scm2double (me->get_grob_property ("thickness")) + * me->paper_l ()->get_var ("stafflinethickness"); + + Bezier b; + int i = 0; + for (SCM s= cp; s != SCM_EOL; s = ly_cdr (s)) + { + b.control_[i] = ly_scm2offset (ly_car (s)); + i++; + } + + Molecule a = Lookup::slur (b, Directional_element_interface::get (me) * thick, thick); + + return a.smobbed_copy (); } +