X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie.cc;h=65f2f24aac28eb731e888fc83bd288da80384602;hb=a6ee9dcd388111e842064a8d46ab06c4897a00d2;hp=2b0e032b7c835688d4df01b1657a31a3829841dd;hpb=28d97df78de5e56962730b42119c2d9b73401fa7;p=lilypond.git diff --git a/lily/tie.cc b/lily/tie.cc index 2b0e032b7c..65f2f24aac 100644 --- a/lily/tie.cc +++ b/lily/tie.cc @@ -3,263 +3,333 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 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 "rhythmic-head.hh" #include "bezier.hh" #include "paper-column.hh" -#include "debug.hh" +#include "warn.hh" #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? + */ + void -Tie::set_head (Direction d, Item * head_l) +Tie::set_head (Grob*me,Direction d, Item * h) { - assert (!head (d)); - index_set_cell (get_elt_property ("heads"), d, head_l->self_scm_); + assert (!head (me,d)); + index_set_cell (me->get_grob_property ("heads"), d, h->self_scm ()); - set_bound (d, head_l); - add_dependency (head_l); + dynamic_cast (me)->set_bound (d, h); + me->add_dependency (h); } -Tie::Tie() +void +Tie::set_interface (Grob*me) { - set_elt_property ("heads", gh_cons (SCM_EOL, SCM_EOL)); - dy_f_drul_[LEFT] = dy_f_drul_[RIGHT] = 0.0; - dx_f_drul_[LEFT] = dx_f_drul_[RIGHT] = 0.0; - + me->set_grob_property ("heads", gh_cons (SCM_EOL, SCM_EOL)); } -Note_head* -Tie::head (Direction d) const + +Grob* +Tie::head (Grob*me, Direction d) { - SCM c = get_elt_property ("heads"); - c = index_cell (c, d); + SCM c = me->get_grob_property ("heads"); + c = index_get_cell (c, d); - return dynamic_cast (unsmob_element (c)); + return unsmob_grob (c); } Real -Tie::position_f () const +Tie::get_position (Grob*me) { - return head (LEFT) - ? staff_symbol_referencer (head (LEFT)).position_f () - : staff_symbol_referencer (head (RIGHT)).position_f () ; + 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 - */ + 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). +*/ Direction -Tie::get_default_dir () const +Tie::get_default_dir (Grob*me) { - Stem * sl = head(LEFT) ? head (LEFT)->stem_l () :0; - Stem * sr = head(RIGHT) ? head (RIGHT)->stem_l () :0; + 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 && directional_element (sl).get () == UP - && sr && directional_element (sr).get () == UP) - return DOWN; - else - return UP; -} + 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); + } -void -Tie::do_add_processing() -{ - if (!(head (LEFT) && head (RIGHT))) - warning (_ ("lonely tie")); - - Direction d = LEFT; - Drul_array new_head_drul; - new_head_drul[LEFT] = head(LEFT); - new_head_drul[RIGHT] = head(RIGHT); - do { - if (!head (d)) - new_head_drul[d] = head((Direction)-d); - } while (flip(&d) != LEFT); - - index_set_cell (get_elt_property ("heads"), LEFT, new_head_drul[LEFT]->self_scm_ ); - index_set_cell (get_elt_property ("heads"), RIGHT, new_head_drul[RIGHT]->self_scm_ ); + + return UP; } -void -Tie::after_line_breaking () -{ - if (!head (LEFT) && !head (RIGHT)) + +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 { programming_error ("Tie without heads."); - set_elt_property ("transparent", SCM_BOOL_T); - set_extent_callback (0, X_AXIS); - set_extent_callback (0, Y_AXIS); - return; + me->suicide (); + return SCM_UNSPECIFIED; } - if (!directional_element (this).get ()) - directional_element (this).set (get_default_dir ()); - Real staff_space = staff_symbol_referencer (this).staff_space (); - Real half_space = staff_space / 2; - Real x_gap_f = paper_l ()->get_var ("tie_x_gap"); - Real y_gap_f = paper_l ()->get_var ("tie_y_gap"); - - /* - Slur and tie placement [OSU] - - Ties: + if (!Directional_element_interface::get (me)) + Directional_element_interface::set (me, Tie::get_default_dir (me)); + Direction dir = Directional_element_interface::get (me); + + Real staff_space = Staff_symbol_referencer::staff_space (me); - * x = inner vertical tangent - d * gap + Real x_gap_f = gh_scm2double (me->get_grob_property ("x-gap")); - */ + 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; /* - OSU: not different for outer notes, so why all this code? - ie, can we drop this, or should it be made switchable. + 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. */ - if (head (LEFT)) - dx_f_drul_[LEFT] = head (LEFT)->extent (X_AXIS).length (); - else - dx_f_drul_[LEFT] = get_broken_left_end_align (); - dx_f_drul_[LEFT] += x_gap_f; - dx_f_drul_[RIGHT] -= x_gap_f; - - /* - Slur and tie placement [OSU] -- check this - - Ties: - - * y = dx < 5ss: horizontal tangent - y = dx >= 5ss: y next interline - d * 0.25 ss - - which probably means that OSU assumes that - - dy <= 5 dx - - for smal slurs - */ - + Real lambda = 0.9; + + if (Note_head::has_interface (l)) + { + Real where = RIGHT; - Real ypos = position_f (); + /* + 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; + } + else + left_x = l->extent (l, X_AXIS).linear_combination (lambda); + - Real y_f = half_space * ypos; - int ypos_i = int (ypos); - - Real dx_f = extent (X_AXIS).length () + dx_f_drul_[RIGHT] - dx_f_drul_[LEFT]; - Direction dir = directional_element (this).get(); - if (dx_f < paper_l ()->get_var ("tie_staffspace_length")) + Real width; + if (Note_head::has_interface (l) && Note_head::has_interface (r)) { - if (abs (ypos_i) % 2) - y_f += dir * half_space; - y_f += dir * y_gap_f; + width = + + r->extent (commonx,X_AXIS)[LEFT] + - l->extent (commonx, X_AXIS)[RIGHT] + -2 * x_gap_f; } else { - if (! (abs (ypos_i) % 2)) - y_f += dir * half_space; - y_f += dir * half_space; - y_f -= dir * y_gap_f; + 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; } - dy_f_drul_[LEFT] = dy_f_drul_[RIGHT] = y_f; -} + SCM details = me->get_grob_property ("details"); -Array -Tie::get_rods () const -{ - Array a; - Rod r; + 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))); - r.item_l_drul_ [LEFT]=get_bound (LEFT); - r.item_l_drul_ [RIGHT]=get_bound (RIGHT); + Bezier b = slur_shape (width, h_inf, r_0); - r.distance_f_ = paper_l ()->get_var ("tie_x_minimum"); - a.push (r); - return a; -} + /* + 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 * gh_scm2double (me->get_grob_property ("y-offset"));; -Molecule -Tie::do_brew_molecule () const -{ - Real thick = paper_l ()->get_var ("tie_thickness"); - Bezier one = get_curve (); + /* + 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) + { + ypos += 0.5 * dir ; + } + } - Molecule a; - SCM d = get_elt_property ("dashed"); - if (gh_number_p (d)) - a = lookup_l ()->dashed_slur (one, thick, gh_scm2int (d)); - else - a = lookup_l ()->slur (one, directional_element (this).get () * thick, thick); - return a; -} - - + /* + todo: prevent ending / staffline collision. -Bezier -Tie::get_curve () const -{ - Direction d (directional_element (this).get ()); - Bezier_bow b (get_encompass_offset_arr (), d); + todo: tie / stem collision + */ - Real staff_space = staff_symbol_referencer (this).staff_space (); - Real h_inf = paper_l ()->get_var ("tie_height_limit_factor") * staff_space; - Real r_0 = paper_l ()->get_var ("tie_ratio"); + b = slur_shape (width,h_inf, r_0); + b.scale (1, dir); + b.translate (Offset (left_x, ypos)); + - b.set_default_bezier (h_inf, r_0); - Bezier c = b.get_bezier (); + /* + Avoid colliding of the horizontal part with stafflines. - /* should do this for slurs as well. */ - Array horizontal (c.solve_derivative (Offset (1,0))); + + 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 ()) { /* ugh. Doesnt work for non-horizontal curves. */ - Real y = c.curve_point (horizontal[0])[Y_AXIS]; + Real y = b.curve_point (horizontal[0])[Y_AXIS]; Real ry = rint (y/staff_space) * staff_space; Real diff = ry - y; Real newy = y; - if (fabs (y) <= 2.0 - && fabs (diff) < paper_l ()->get_var ("tie_staffline_clearance")) + + Real clear = staff_space * gh_scm2double (me->get_grob_property ("staffline-clearance")); + + if (fabs (y) <= Staff_symbol_referencer::staff_radius (me) + && fabs (diff) < clear) { - newy = ry - 0.5 * staff_space * sign (diff) ; + 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 = c.control_ [0][Y_AXIS]; - c.control_[2][Y_AXIS] = - c.control_[1][Y_AXIS] = - (c.control_[1][Y_AXIS] - y0) * ((newy - y0) / (y - y0)) + y0; + 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; } else programming_error ("Tie is nowhere horizontal"); - return c; + + + + SCM controls = SCM_EOL; + for (int i= 4; i--;) + controls = gh_cons (ly_offset2scm (b.control_[i]), controls); + return controls; } -Array -Tie::get_encompass_offset_arr () const + +MAKE_SCHEME_CALLBACK (Tie,brew_molecule,1); +SCM +Tie::brew_molecule (SCM smob) { - Array offset_arr; - offset_arr.push (Offset (dx_f_drul_[LEFT], dy_f_drul_[LEFT])); - offset_arr.push (Offset (spanner_length () + dx_f_drul_[RIGHT], - dy_f_drul_[RIGHT])); - - return offset_arr; + 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->get_paper ()->get_var ("linethickness"); + + 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 (); } + +ADD_INTERFACE (Tie,"tie-interface", + "A tie connecting two noteheads. +direction = Forced direction for all ties", + "y-offset staffline-clearance control-points heads details thickness x-gap direction minimum-length");