X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie.cc;h=569aa220ad9cc9ec0cc35afe8b150a5000337e2b;hb=ca20eaa74e7e762c0611de26cc2267909ae27e02;hp=46c42a819b3cc5c8199c898761ee92ca4e2e7d68;hpb=f1f05196a6b5048718405a0810868c145bceef29;p=lilypond.git diff --git a/lily/tie.cc b/lily/tie.cc index 46c42a819b..569aa220ad 100644 --- a/lily/tie.cc +++ b/lily/tie.cc @@ -3,25 +3,26 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2002 Han-Wen Nienhuys + (c) 1997--2005 Han-Wen Nienhuys */ -#include +#include "tie.hh" + +#include #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 "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" /* tie: Connect two noteheads. @@ -37,10 +38,10 @@ void -Tie::set_head (Grob*me,Direction d, Grob * h) +Tie::set_head (Grob*me, Direction d, Grob * h) { - assert (!head (me,d)); - index_set_cell (me->get_grob_property ("heads"), d, h->self_scm ()); + 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); @@ -49,24 +50,38 @@ Tie::set_head (Grob*me,Direction d, Grob * h) void Tie::set_interface (Grob*me) { - me->set_grob_property ("heads", gh_cons (SCM_EOL, SCM_EOL)); + me->set_property ("head-pair", scm_cons (SCM_EOL, SCM_EOL)); } Grob* Tie::head (Grob*me, Direction d) { - SCM c = me->get_grob_property ("heads"); - c = index_get_cell (c, d); + SCM c = me->get_property ("head-pair"); + + if (scm_is_pair (c)) + return unsmob_grob (index_get_cell (c, d)); + else + return 0; +} + +int +Tie::get_column_rank (Grob *me, Direction d) +{ + Spanner *span = dynamic_cast (me); + Grob * h = head (me, d); + if (!h) + h = span->get_bound (d); - return unsmob_grob (c); + 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)); + Direction d = head (me, LEFT) ? LEFT:RIGHT; + return Staff_symbol_referencer::get_position (head (me, d)); } @@ -77,23 +92,25 @@ Tie::get_position (Grob*me) The direction of the Tie is more complicated (See [Ross] p136 and further). + + (what about linebreaks? ) + */ Direction Tie::get_default_dir (Grob*me) { - 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; - + 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); } @@ -101,30 +118,46 @@ Tie::get_default_dir (Grob*me) } +void +Tie::set_direction (Grob*me) +{ + 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)); + } +} + +/* + 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) { Spanner*me = unsmob_spanner (smob); Direction headdir = CENTER; - if (head (me,LEFT)) + if (head (me, LEFT)) headdir = LEFT; - else if (head (me,RIGHT)) + else if (head (me, RIGHT)) headdir = RIGHT; else { programming_error ("Tie without heads."); me->suicide (); - return SCM_UNSPECIFIED; + return SCM_EOL; } - - if (!Directional_element_interface::get (me)) - Directional_element_interface::set (me, Tie::get_default_dir (me)); - Direction dir = Directional_element_interface::get (me); + set_direction (me); + + Direction dir = get_grob_direction (me); Real staff_space = Staff_symbol_referencer::staff_space (me); - Real x_gap_f = gh_scm2double (me->get_grob_property ("x-gap")); + Real x_gap_f = robust_scm2double (me->get_property ("x-gap"), 0); Grob* l = me->get_bound (LEFT); Grob* r = me->get_bound (RIGHT); @@ -161,7 +194,7 @@ Tie::get_control_points (SCM smob) if (Note_head::has_interface (l) && Note_head::has_interface (r)) { width = - + r->extent (commonx,X_AXIS)[LEFT] + + r->extent (commonx, X_AXIS)[LEFT] - l->extent (commonx, X_AXIS)[RIGHT] -2 * x_gap_f; } @@ -180,13 +213,13 @@ Tie::get_control_points (SCM smob) - SCM details = me->get_grob_property ("details"); + SCM details = me->get_property ("details"); SCM lim // groetjes aan de chirurgendochter. - = scm_assq (ly_symbol2scm ("height-limit"),details); + = 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))); + 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); @@ -199,7 +232,7 @@ Tie::get_control_points (SCM smob) */ Real ypos = Tie::get_position (me) * staff_space/2 - + dir * gh_scm2double (me->get_grob_property ("y-offset"));; + + dir * scm_to_double (me->get_property ("y-offset"));; /* Make sure we don't start on a dots @@ -207,7 +240,7 @@ Tie::get_control_points (SCM smob) 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 + if (fabs (staff_space * Staff_symbol_referencer::get_position (dots) /2 - ypos) < 0.5) { ypos += 0.5 * dir ; @@ -221,7 +254,7 @@ Tie::get_control_points (SCM smob) todo: tie / stem collision */ - b = slur_shape (width,h_inf, r_0); + b = slur_shape (width, h_inf, r_0); b.scale (1, dir); b.translate (Offset (left_x, ypos)); @@ -235,7 +268,7 @@ Tie::get_control_points (SCM smob) TODO: doesn't work when on staff with even number of lines. */ - Array horizontal (b.solve_derivative (Offset (1,0))); + Array horizontal (b.solve_derivative (Offset (1, 0))); if (horizontal.size ()) { /* @@ -247,7 +280,7 @@ Tie::get_control_points (SCM smob) Real diff = ry - y; Real newy = y; - Real clear = staff_space * gh_scm2double (me->get_grob_property ("staffline-clearance")); + Real clear = staff_space * scm_to_double (me->get_property ("staffline-clearance")); if (fabs (y) <= Staff_symbol_referencer::staff_radius (me) * staff_space + clear @@ -292,45 +325,48 @@ Tie::get_control_points (SCM smob) SCM controls = SCM_EOL; - for (int i= 4; i--;) - controls = gh_cons (ly_offset2scm (b.control_[i]), controls); + for (int i = 4; i--;) + controls = scm_cons (ly_offset2scm (b.control_[i]), controls); return controls; } -MAKE_SCHEME_CALLBACK (Tie,brew_molecule,1); +MAKE_SCHEME_CALLBACK (Tie, print, 1); SCM -Tie::brew_molecule (SCM smob) +Tie::print (SCM smob) { Grob*me = unsmob_grob (smob); - SCM cp = me->get_grob_property ("control-points"); - if (cp == SCM_EOL) + SCM cp = me->get_property ("control-points"); + if (!scm_is_pair (cp)) // list is more accurate { cp = get_control_points (smob); - me->set_grob_property ("control-points", cp); + me->set_property ("control-points", cp); } + + if (!scm_is_pair (cp)) + return Stencil ().smobbed_copy (); - Real thick = - gh_scm2double (me->get_grob_property ("thickness")) - * me->get_paper ()->get_var ("linethickness"); + Real thick + = Staff_symbol_referencer::line_thickness (me) + * robust_scm2double (me->get_property ("thickness"), 1); Bezier b; int i = 0; - for (SCM s= cp; s != SCM_EOL; s = ly_cdr (s)) + for (SCM s = cp; s != SCM_EOL; s = scm_cdr (s)) { - b.control_[i] = ly_scm2offset (ly_car (s)); + b.control_[i] = ly_scm2offset (scm_car (s)); i++; } - Molecule a = Lookup::slur (b, Directional_element_interface::get (me) * thick, thick); + Stencil a = Lookup::slur (b, get_grob_direction (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"); +ADD_INTERFACE (Tie, "tie-interface", + "A tie connecting two noteheads.\n" + , + "y-offset staffline-clearance control-points head-pair details thickness x-gap direction minimum-length");