X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie.cc;h=d79ffccd55c327d7e0583a8a965aebc8efe55759;hb=75eebcb49e52d296b1da3e1074e0825d2c780db4;hp=403b991a3261d9b19a14df49d872fb6c0606ecff;hpb=c802622f935af83bb791ded58056428d6be31d0a;p=lilypond.git diff --git a/lily/tie.cc b/lily/tie.cc index 403b991a32..d79ffccd55 100644 --- a/lily/tie.cc +++ b/lily/tie.cc @@ -3,331 +3,257 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2006 Han-Wen Nienhuys */ -#include - +#include "tie.hh" #include "spanner.hh" #include "lookup.hh" -#include "paper-def.hh" -#include "tie.hh" +#include "output-def.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 "bezier.hh" #include "stem.hh" #include "note-head.hh" +#include "tie-column.hh" +#include "grob-array.hh" +#include "tie-formatting-problem.hh" +#include "tie-configuration.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 (Score_element*me,Direction d, Item * head_l) +int +Tie::compare (Grob *const &s1, + Grob *const &s2) { - assert (!head (me,d)); - index_set_cell (me->get_elt_property ("heads"), d, head_l->self_scm ()); - - dynamic_cast (me)->set_bound (d, head_l); - me->add_dependency (head_l); + return sign (Tie::get_position (s1) - Tie::get_position (s2)); } void -Tie::set_interface (Score_element*me) +Tie::set_head (Grob *me, Direction d, Grob *h) { - me->set_elt_property ("heads", gh_cons (SCM_EOL, SCM_EOL)); - me->set_interface (ly_symbol2scm ("tie-interface")); + dynamic_cast (me)->set_bound (d, h); } -bool -Tie::has_interface (Score_element*me) +Grob * +Tie::head (Grob *me, Direction d) { - return me->has_interface (ly_symbol2scm ("tie-interface")); + Item *it = dynamic_cast (me)->get_bound (d); + if (Note_head::has_interface (it)) + return it; + else + return 0; } -Score_element* -Tie::head (Score_element*me, Direction d) +int +Tie::get_column_rank (Grob *me, Direction d) { - SCM c = me->get_elt_property ("heads"); - c = index_cell (c, d); + Spanner *span = dynamic_cast (me); + Grob *h = head (me, d); + if (!h) + h = span->get_bound (d); - return unsmob_element (c); + Grob *col = dynamic_cast (h)->get_column (); + return Paper_column::get_rank (col); } -Real -Tie::position_f (Score_element*me) +int +Tie::get_position (Grob *me) { - Direction d = head (me,LEFT) ? LEFT:RIGHT; - return Staff_symbol_referencer::position_f (head (me,d)); -} + Direction d = LEFT; + do + { + Grob *h = head (me, d); + if (h) + return (int) Staff_symbol_referencer::get_position (h); + } + while (flip (&d) != LEFT); + + /* + TODO: this is theoretically possible for ties across more than 2 + systems.. We should look at the first broken copy. + + */ + programming_error ("Tie without heads. Suicide"); + me->suicide (); + return 0; +} /* 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 (Score_element*me) +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; - + 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 (Directional_element_interface::get (sl) == UP - && Directional_element_interface::get (sr) == UP) + if (get_grob_direction (sl) == UP + && get_grob_direction (sr) == UP) return DOWN; } else if (sl || sr) { Item *s = sl ? sl : sr; - return - Directional_element_interface::get (s); + return -get_grob_direction (s); } - return UP; } +MAKE_SCHEME_CALLBACK(Tie, calc_direction, 1); SCM -Tie::get_control_points (SCM smob) -{ - Spanner*me = dynamic_cast (unsmob_element (smob)); - Direction headdir = CENTER; - if (head (me,LEFT)) - headdir = LEFT; - else if (head(me,RIGHT)) - headdir = RIGHT; - else +Tie::calc_direction (SCM smob) +{ + Grob *me = unsmob_grob (smob); + Grob *yparent = me->get_parent (Y_AXIS); + if (Tie_column::has_interface (yparent) + && unsmob_grob_array (yparent->get_object ("ties")) + && unsmob_grob_array (yparent->get_object ("ties"))->size () > 1) { - programming_error ("Tie without heads."); - me->suicide (); - return SCM_UNSPECIFIED; + /* trigger positioning. */ + (void) yparent->get_property ("positioning-done"); } - - 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_elt_property ("x-gap")); - - Score_element* l = me->get_bound (LEFT); - Score_element* r = me->get_bound (RIGHT); - - Score_element* 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 (me->get_bound (LEFT))) - left_x = l->extent (l, X_AXIS)[RIGHT] + x_gap_f; else - left_x = l->extent (l, X_AXIS).linear_combination (lambda); - + set_grob_direction (me, Tie::get_default_dir (me)); - Real width; - if (Note_head::has_interface (me->get_bound (LEFT)) - && Note_head::has_interface (me->get_bound (RIGHT))) - { - width = - + r->extent (commonx,X_AXIS)[LEFT] - - l->extent (commonx, X_AXIS)[RIGHT] - -2 * x_gap_f; - } - else - { - if (Note_head::has_interface (me->get_bound (LEFT))) - 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); + return SCM_UNSPECIFIED; +} - SCM details = me->get_elt_property ("details"); - SCM lim // groetjes aan de chirurgendochter. - = scm_assq (ly_symbol2scm ("height-limit"),details); +void +Tie::set_default_control_points (Grob *me_grob) +{ + Spanner *me = dynamic_cast (me_grob); + Grob *common = me; + common = me->get_bound (LEFT)->common_refpoint (common, X_AXIS); + common = me->get_bound (RIGHT)->common_refpoint (common, X_AXIS); - Real h_inf = gh_scm2double (gh_cdr (lim)) * staff_space; - Real r_0 = gh_scm2double (gh_cdr (scm_assq (ly_symbol2scm ("ratio"),details))); - - Bezier b = slur_shape (width, h_inf, r_0); + Tie_formatting_problem problem; + problem.from_tie (me); - Offset leave_dir = b.control_[1] - b.control_[0]; - - Score_element *hed =head (me, headdir); - Real dx = (hed->extent (hed, X_AXIS).length () + x_gap_f)/2.0; - Real max_gap = leave_dir[Y_AXIS] * dx / leave_dir[X_AXIS]; - - /* - for small ties (t small) we want to start in the Y-center (so dy = 0), for - large ties, the tie should appear to come from the center of the - head, so dy = max_gap - - maybe use a different formula? - - TODO: what if 2 heads have different size. - - TODO: for small ties, it is better to start over the heads - iso. next to the heads. - */ - Real t = (width / staff_space - 5.0); // ugh. - Real dy = t > 0 ? max_gap * sqr (t / (1 + t)) : 0.0; - - Real ypos = Tie::position_f (me) * staff_space/2 + dir * dy; - - /* - todo: prevent ending / staffline collision. + // get_configuration (me, &conf, problem); + int tie_position = (int) Tie::get_position (me); + Tie_configuration conf + = problem.find_optimal_tie_configuration (tie_position, get_grob_direction (me)); + set_control_points (me, problem.common_x_refpoint (), + conf, problem.details_); +} - todo: tie / stem collision - */ +void +Tie::set_control_points (Grob *me, + Grob *common, + Tie_configuration const &conf, + Tie_details const &details + ) +{ + Bezier b = conf.get_transformed_bezier (details); + b.translate (Offset (- me->relative_coordinate (common, X_AXIS), 0)); - b = slur_shape(width,h_inf, r_0); - b.scale (1, dir); - b.translate (Offset (left_x, ypos)); - + SCM controls = SCM_EOL; + for (int i = 4; i--;) + { + if (!b.control_[i].is_sane ()) + programming_error ("Insane offset"); + controls = scm_cons (ly_offset2scm (b.control_[i]), controls); + } + me->set_property ("control-points", controls); +} - /* - Avoid colliding of the horizontal part with stafflines. +MAKE_SCHEME_CALLBACK(Tie, calc_control_points, 1); +SCM +Tie::calc_control_points (SCM smob) +{ + Grob *me = unsmob_grob (smob); - - TODO: redo this, heuristic is half-baken, and ties often look ugly - as a result. + // trigger Tie-column + (void) get_grob_direction (me); - TODO: doesn't work when on staff with even number of lines. - */ - Array horizontal (b.solve_derivative (Offset (1,0))); - if (horizontal.size ()) + Grob *yparent = me->get_parent (Y_AXIS); + if (Tie_column::has_interface (yparent) + && unsmob_grob_array (yparent->get_object ("ties")) + && unsmob_grob_array (yparent->get_object ("ties"))->size () > 1) { - /* - 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_elt_property ("staffline-clearance")); - - if (fabs (y) <= Staff_symbol_referencer::staff_radius (me) - && fabs (diff) < clear) - { - 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) - { - 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; + /* trigger positioning. */ + (void) yparent->get_property ("positioning-done"); } - else - programming_error ("Tie is nowhere horizontal"); - + if (!scm_is_pair (me->get_property ("control-points"))) + { + set_default_control_points (me); + } - SCM controls = SCM_EOL; - for (int i= 4; i--;) - controls = gh_cons ( ly_offset2scm (b.control_[i]), controls); - return controls; + return SCM_UNSPECIFIED; } -MAKE_SCHEME_CALLBACK(Tie,set_spacing_rods,1); -/* - TODO: set minimum distances for begin/end of line - */ +MAKE_SCHEME_CALLBACK (Tie, print, 1); SCM -Tie::set_spacing_rods (SCM smob) +Tie::print (SCM smob) { - Score_element*me = unsmob_element (smob); - Spanner*sp = dynamic_cast (me); - Rod r; - - r.item_l_drul_ [LEFT]=sp->get_bound (LEFT); - r.item_l_drul_ [RIGHT]=sp->get_bound (RIGHT); + Grob *me = unsmob_grob (smob); - r.distance_f_ - = gh_scm2double (me->get_elt_property ("minimum-length")) - * 1.0; - r.add_to_cols (); - return SCM_UNSPECIFIED; -} - -MAKE_SCHEME_CALLBACK(Tie,brew_molecule,1); -SCM -Tie::brew_molecule (SCM smob) -{ - Score_element*me = unsmob_element (smob); + SCM cp = me->get_property ("control-points"); - SCM cp = me->get_elt_property ("control-points"); - if (cp == SCM_EOL) - { - cp = get_control_points (smob); - me->set_elt_property ("control-points", cp); - } - - Real thick = - gh_scm2double (me->get_elt_property ("thickness")) - * me->paper_l ()->get_var ("stafflinethickness"); + 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 = gh_cdr (s)) + for (SCM s = cp; s != SCM_EOL; s = scm_cdr (s)) { - b.control_[i] = ly_scm2offset (gh_car (s)); + b.control_[i] = ly_scm2offset (scm_car (s)); i++; } - - Molecule a = Lookup::slur (b, Directional_element_interface::get (me) * thick, thick); - - return a.smobbed_copy (); + + 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\n" + , + + + /* properties */ + "avoid-slur " // UGH. + "control-points " + "dash-fraction " + "dash-period " + "details " + "direction " + "thickness " + "x-gap "); + + +