X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie.cc;h=a3083a1d7c36fc0892bfb373654dcce70c3833e7;hb=d7c0f4263534307616c82d9b2ce6fdef9472456f;hp=980484d21bcdaed4b0345b1fdee3f5891f5a7ffa;hpb=10fcff2ab04beb0f31888d56f22855e84c08c3a7;p=lilypond.git diff --git a/lily/tie.cc b/lily/tie.cc index 980484d21b..a3083a1d7c 100644 --- a/lily/tie.cc +++ b/lily/tie.cc @@ -1,9 +1,20 @@ /* - tie.cc -- implement Tie + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1997--2010 Han-Wen Nienhuys - (c) 1997--2007 Han-Wen Nienhuys + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #include "tie.hh" @@ -29,10 +40,8 @@ #include "warn.hh" #include "semi-tie-column.hh" - bool -Tie::less (Grob *const &s1, - Grob *const &s2) +Tie::less (Grob *const &s1, Grob *const &s2) { return Tie::get_position (s1) < Tie::get_position (s2); } @@ -47,15 +56,15 @@ Grob * Tie::head (Grob *me, Direction d) { if (is_direction (me->get_property ("head-direction"))) - { - Direction hd = to_dir (me->get_property ("head-direction")); - - return (hd == d) - ? unsmob_grob (me->get_object ("note-head")) - : 0; - } - - Item *it = dynamic_cast (me)->get_bound (d); + { + Direction hd = to_dir (me->get_property ("head-direction")); + + return (hd == d) + ? unsmob_grob (me->get_object ("note-head")) + : 0; + } + + Item *it = dynamic_cast (me)->get_bound (d); if (Note_head::has_interface (it)) return it; else @@ -65,12 +74,18 @@ Tie::head (Grob *me, Direction d) int Tie::get_column_rank (Grob *me, Direction d) { + Grob *col = 0; Spanner *span = dynamic_cast (me); - Grob *h = head (me, d); - if (!h) - h = span->get_bound (d); + if (!span) + col = dynamic_cast (me)->get_column (); + else + { + Grob *h = head (me, d); + if (!h) + h = span->get_bound (d); - Grob *col = dynamic_cast (h)->get_column (); + col = dynamic_cast (h)->get_column (); + } return Paper_column::get_rank (col); } @@ -87,10 +102,9 @@ Tie::get_position (Grob *me) while (flip (&d) != LEFT); /* + TODO: this is theoretically possible for ties across more than 2 + systems.. We should look at the first broken copy. - 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 (); @@ -110,22 +124,22 @@ Tie::get_position (Grob *me) Direction Tie::get_default_dir (Grob *me) { - Drul_array stems; + Drul_array stems; Direction d = LEFT; do { Grob *one_head = head (me, d); - if (!one_head && dynamic_cast (me)) - one_head = Tie::head (dynamic_cast (me)->broken_neighbor (d), d); - + if (!one_head && dynamic_cast (me)) + one_head = Tie::head (dynamic_cast (me)->broken_neighbor (d), d); + Grob *stem = one_head ? Rhythmic_head::get_stem (one_head) : 0; if (stem) stem = Stem::is_invisible (stem) ? 0 : stem; stems[d] = stem; } - while (flip (&d)!= LEFT); - + while (flip (&d) != LEFT); + if (stems[LEFT] && stems[RIGHT]) { if (get_grob_direction (stems[LEFT]) == UP @@ -139,10 +153,9 @@ Tie::get_default_dir (Grob *me) } else if (int p = get_position (me)) return Direction (sign (p)); - - return to_dir (me->get_property("neutral-direction")); -} + return to_dir (me->get_property ("neutral-direction")); +} MAKE_SCHEME_CALLBACK (Tie, calc_direction, 1); SCM @@ -151,7 +164,7 @@ Tie::calc_direction (SCM smob) Grob *me = unsmob_grob (smob); Grob *yparent = me->get_parent (Y_AXIS); if ((Tie_column::has_interface (yparent) - || Semi_tie_column::has_interface (yparent)) + || Semi_tie_column::has_interface (yparent)) && unsmob_grob_array (yparent->get_object ("ties")) // && unsmob_grob_array (yparent->get_object ("ties"))->size () > 1 ) @@ -165,26 +178,24 @@ Tie::calc_direction (SCM smob) return scm_from_int (Tie::get_default_dir (me)); } - SCM Tie::get_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); - + 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); + Tie_formatting_problem problem; problem.from_tie (me); - + Tie_specification spec = problem.get_tie_specification (0); if (!me->is_live ()) return SCM_EOL; - Ties_configuration conf = problem.generate_optimal_configuration (); - + return get_control_points (me, problem.common_x_refpoint (), conf[0], problem.details_); } @@ -193,8 +204,7 @@ SCM Tie::get_control_points (Grob *me, Grob *common, Tie_configuration const &conf, - Tie_details const &details - ) + Tie_details const &details) { Bezier b = conf.get_transformed_bezier (details); b.translate (Offset (- me->relative_coordinate (common, X_AXIS), 0)); @@ -209,7 +219,6 @@ Tie::get_control_points (Grob *me, return controls; } - MAKE_SCHEME_CALLBACK (Tie, calc_control_points, 1); SCM Tie::calc_control_points (SCM smob) @@ -218,41 +227,36 @@ Tie::calc_control_points (SCM smob) Grob *yparent = me->get_parent (Y_AXIS); if ((Tie_column::has_interface (yparent) - || Semi_tie_column::has_interface (yparent)) - && unsmob_grob_array (yparent->get_object ("ties")) - // && unsmob_grob_array (yparent->get_object ("ties"))->size () > 1 - ) + || Semi_tie_column::has_interface (yparent)) + && unsmob_grob_array (yparent->get_object ("ties"))) { extract_grob_set (yparent, "ties", ties); - if (ties.size() == 1 + if (me->original () && ties.size () == 1 && !to_dir (me->get_property_data ("direction"))) { assert (ties[0] == me); set_grob_direction (me, Tie::get_default_dir (me)); } - /* trigger positioning. */ (void) yparent->get_property ("positioning-done"); } SCM cp = me->get_property_data ("control-points"); if (!scm_is_pair (cp)) - { - cp = get_default_control_points (me); - } + cp = get_default_control_points (me); return cp; } /* TODO: merge with Slur::print. - */ +*/ MAKE_SCHEME_CALLBACK (Tie, print, 1); SCM Tie::print (SCM smob) { Grob *me = unsmob_grob (smob); - + SCM cp = me->get_property ("control-points"); Real staff_thick = Staff_symbol_referencer::line_thickness (me); @@ -269,17 +273,11 @@ Tie::print (SCM smob) 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, - line_thick, - robust_scm2double (p, 1.0), - robust_scm2double (f, 0)); - else - a = Lookup::slur (b, - get_grob_direction (me) * base_thick, - line_thick); + SCM dash_definition = me->get_property ("dash-definition"); + a = Lookup::slur (b, + get_grob_direction (me) * base_thick, + line_thick, + dash_definition); #if DEBUG_TIE_SCORING SCM annotation = me->get_property ("annotation"); @@ -304,7 +302,7 @@ Tie::print (SCM smob) /* It would be nice if we could put this in a different layer, but alas, this must be done with a Tie override. - */ + */ a.add_stencil (tm); } #endif @@ -314,25 +312,18 @@ Tie::print (SCM smob) ADD_INTERFACE (Tie, "A horizontal curve connecting two noteheads.", - + /* properties */ "annotation " "avoid-slur " // UGH. "control-points " - "dash-fraction " - "dash-period " + "dash-definition " "details " "direction " "head-direction " "line-thickness " "neutral-direction " "quant-score " - "separation-item " "staff-position " "thickness " ); - - - - -