X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Ftie.cc;h=dff6305ec03ae24481cb0d6dca85f7445198bcc6;hb=e62c1e205cd619afcc43fd8c8a9a2c5a093b508e;hp=cd4591fd5186651593a03a1c3e37e0d87d05d985;hpb=1d82fc8d023cc2a273e8de26d26fe18afbe314cf;p=lilypond.git diff --git a/lily/tie.cc b/lily/tie.cc index cd4591fd51..dff6305ec0 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--2009 Han-Wen Nienhuys - (c) 1997--2006 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" @@ -17,6 +28,7 @@ #include "note-head.hh" #include "output-def.hh" #include "paper-column.hh" +#include "pointer-group-interface.hh" #include "rhythmic-head.hh" #include "spanner.hh" #include "staff-symbol-referencer.hh" @@ -26,13 +38,13 @@ #include "tie-configuration.hh" #include "tie-formatting-problem.hh" #include "warn.hh" +#include "semi-tie-column.hh" -int -Tie::compare (Grob *const &s1, - Grob *const &s2) +bool +Tie::less (Grob *const &s1, Grob *const &s2) { - return sign (Tie::get_position (s1) - Tie::get_position (s2)); + return Tie::get_position (s1) < Tie::get_position (s2); } void @@ -44,6 +56,15 @@ Tie::set_head (Grob *me, Direction d, Grob *h) 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); if (Note_head::has_interface (it)) return it; @@ -71,7 +92,7 @@ Tie::get_position (Grob *me) { Grob *h = head (me, d); if (h) - return (int) Staff_symbol_referencer::get_position (h); + return (int) rint (Staff_symbol_referencer::get_position (h)); } while (flip (&d) != LEFT); @@ -103,7 +124,11 @@ Tie::get_default_dir (Grob *me) Direction d = LEFT; do { - Grob *stem = head (me, d) ? Rhythmic_head::get_stem (head (me, d)) : 0; + Grob *one_head = head (me, 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; @@ -122,33 +147,37 @@ Tie::get_default_dir (Grob *me) Grob *s = stems[LEFT] ? stems[LEFT] : stems[RIGHT]; return -get_grob_direction (s); } - - return UP; + else if (int p = get_position (me)) + return Direction (sign (p)); + + return to_dir (me->get_property("neutral-direction")); } -MAKE_SCHEME_CALLBACK(Tie, calc_direction, 1); +MAKE_SCHEME_CALLBACK (Tie, calc_direction, 1); SCM Tie::calc_direction (SCM smob) { Grob *me = unsmob_grob (smob); Grob *yparent = me->get_parent (Y_AXIS); - if (Tie_column::has_interface (yparent) + 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) + // && unsmob_grob_array (yparent->get_object ("ties"))->size () > 1 + ) { /* trigger positioning. */ (void) yparent->get_property ("positioning-done"); + + return me->get_property_data ("direction"); } else - set_grob_direction (me, Tie::get_default_dir (me)); - - return SCM_UNSPECIFIED; + return scm_from_int (Tie::get_default_dir (me)); } -void -Tie::set_default_control_points (Grob *me_grob) +SCM +Tie::get_default_control_points (Grob *me_grob) { Spanner *me = dynamic_cast (me_grob); Grob *common = me; @@ -157,19 +186,21 @@ Tie::set_default_control_points (Grob *me_grob) Tie_formatting_problem problem; problem.from_tie (me); + Tie_specification spec = problem.get_tie_specification (0); - spec.has_manual_dir_ = true; - spec.manual_dir_ = get_grob_direction (me); + if (!me->is_live ()) + return SCM_EOL; + - Tie_configuration conf - = problem.find_optimal_tie_configuration (spec); + Ties_configuration conf + = problem.generate_optimal_configuration (); - set_control_points (me, problem.common_x_refpoint (), - conf, problem.details_); + return get_control_points (me, problem.common_x_refpoint (), + conf[0], problem.details_); } -void -Tie::set_control_points (Grob *me, +SCM +Tie::get_control_points (Grob *me, Grob *common, Tie_configuration const &conf, Tie_details const &details @@ -185,37 +216,43 @@ Tie::set_control_points (Grob *me, programming_error ("Insane offset"); controls = scm_cons (ly_offset2scm (b.control_[i]), controls); } - me->set_property ("control-points", controls); + return controls; } -MAKE_SCHEME_CALLBACK(Tie, calc_control_points, 1); +MAKE_SCHEME_CALLBACK (Tie, calc_control_points, 1); SCM Tie::calc_control_points (SCM smob) { Grob *me = unsmob_grob (smob); - // trigger Tie-column - (void) get_grob_direction (me); - 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) + if ((Tie_column::has_interface (yparent) + || Semi_tie_column::has_interface (yparent)) + && unsmob_grob_array (yparent->get_object ("ties"))) { + extract_grob_set (yparent, "ties", ties); + 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"); } - if (!scm_is_pair (me->get_property ("control-points"))) + SCM cp = me->get_property_data ("control-points"); + if (!scm_is_pair (cp)) { - set_default_control_points (me); + cp = get_default_control_points (me); } - return SCM_UNSPECIFIED; + return cp; } /* - TODO: merge witnh Slur::print. + TODO: merge with Slur::print. */ MAKE_SCHEME_CALLBACK (Tie, print, 1); SCM @@ -231,7 +268,7 @@ Tie::print (SCM smob) Bezier b; int i = 0; - for (SCM s = cp; s != SCM_EOL; s = scm_cdr (s)) + for (SCM s = cp; scm_is_pair (s); s = scm_cdr (s)) { b.control_[i] = ly_scm2offset (scm_car (s)); i++; @@ -239,33 +276,37 @@ 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 quant_score = me->get_property ("quant-score"); - - if (to_boolean (me->layout () - ->lookup_variable (ly_symbol2scm ("debug-tie-scoring"))) - && scm_is_string (quant_score)) + SCM annotation = me->get_property ("annotation"); + if (!scm_is_string (annotation)) + { + SCM debug = me->layout ()->lookup_variable (ly_symbol2scm ("debug-tie-scoring")); + if (to_boolean (debug)) + annotation = me->get_property ("quant-score"); + } + if (scm_is_string (annotation)) { string str; SCM properties = Font_interface::text_font_alist_chain (me); Stencil tm = *unsmob_stencil (Text_interface::interpret_markup (me->layout ()->self_scm (), properties, - quant_score)); - tm.translate_axis (b.control_[0][Y_AXIS]*2, Y_AXIS); - a.add_at_edge (X_AXIS, RIGHT, tm, 1.0, 0); + annotation)); + tm.translate (Offset (b.control_[3][X_AXIS] + 0.5, + b.control_[0][Y_AXIS] * 2)); + tm = tm.in_color (1, 0, 0); + + /* + 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 @@ -273,24 +314,25 @@ Tie::print (SCM smob) } ADD_INTERFACE (Tie, - "tie-interface", - - "A horizontal curve connecting two noteheads. \n\n" - , + "A horizontal curve connecting two noteheads.", - /* properties */ + "annotation " "avoid-slur " // UGH. "control-points " - "dash-fraction " - "dash-period " + "dash-definition " "details " "direction " - "line-thickness " + "head-direction " + "line-thickness " + "neutral-direction " "quant-score " + "separation-item " + "staff-position " "thickness " ); +