X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie-column.cc;h=1ee3d0c03f331512fb5dd99738b7cb6ce79dd8b4;hb=75eebcb49e52d296b1da3e1074e0825d2c780db4;hp=4f9536427b72ecb93c2c8f49dfa6b5121a9f2dc9;hpb=fc3e875d6bf06f0680e897faffdcab36ad975a03;p=lilypond.git diff --git a/lily/tie-column.cc b/lily/tie-column.cc index 4f9536427b..1ee3d0c03f 100644 --- a/lily/tie-column.cc +++ b/lily/tie-column.cc @@ -1,124 +1,116 @@ -/* - tie-column.cc -- implement Tie_column - +/* + tie-column.cc -- implement Tie_column + source file of the GNU LilyPond music typesetter - - (c) 2000--2001 Han-Wen Nienhuys - - */ -#include "spanner.hh" + (c) 2000--2006 Han-Wen Nienhuys +*/ + #include "tie-column.hh" -#include "group-interface.hh" + +#include + +#include "skyline.hh" +#include "warn.hh" +#include "paper-column.hh" +#include "spanner.hh" +#include "pointer-group-interface.hh" #include "tie.hh" #include "directional-element-interface.hh" -#include "rhythmic-head.hh" - +#include "tie-column-format.hh" +#include "tie-formatting-problem.hh" +#include "tie-configuration.hh" +using namespace std; void -Tie_column::set_interface (Grob*me) +Tie_column::add_tie (Grob *me, Grob *tie) { - me->set_interface (ly_symbol2scm ("tie-column-interface")); - me->set_extent_callback (SCM_EOL, X_AXIS); - me->set_extent_callback (SCM_EOL, Y_AXIS) ; -} + if (tie->get_parent (Y_AXIS) + && Tie_column::has_interface (tie->get_parent (Y_AXIS))) + return; -bool -Tie_column::has_interface (Grob*me) -{ - return me->has_interface (ly_symbol2scm ("tie-column-interface")); -} + if (!Pointer_group_interface::count (me, ly_symbol2scm ("ties"))) + { + dynamic_cast (me)->set_bound (LEFT, Tie::head (tie, LEFT)); + dynamic_cast (me)->set_bound (RIGHT, Tie::head (tie, RIGHT)); + } + tie->set_parent (me, Y_AXIS); + Pointer_group_interface::add_grob (me, ly_symbol2scm ("ties"), tie); +} /* - tie dir depends on what Tie_column does. + Extend the spanner over its Tie constituents. */ - -void -Tie_column::add_tie (Grob*me,Grob *s) +MAKE_SCHEME_CALLBACK (Tie_column, before_line_breaking, 1); +SCM +Tie_column::before_line_breaking (SCM smob) { - if (! Pointer_group_interface ::count (me, "ties")) + Spanner *me = dynamic_cast (unsmob_grob (smob)); + for (SCM s = me->get_property ("ties"); scm_is_pair (s); s = scm_cdr (s)) { - dynamic_cast (me)->set_bound (LEFT, Tie::head (s,LEFT)); - dynamic_cast (me)->set_bound (RIGHT, Tie::head (s,RIGHT)); + Spanner *tie = dynamic_cast (unsmob_grob (scm_car (s))); + Direction dir = LEFT; + do + { + if (dir * tie->get_bound (dir)->get_column ()->get_rank () + > dir * me->get_bound (dir)->get_column ()->get_rank ()) + me->set_bound (dir, Tie::head (tie, dir)); + } + while (flip (&dir) != LEFT); } - Pointer_group_interface::add_element (me, "ties",s); - s->add_dependency (me); + return SCM_UNSPECIFIED; } - -int -tie_compare (Grob* const & s1, - Grob* const & s2) +MAKE_SCHEME_CALLBACK(Tie_column, calc_positioning_done, 1) +SCM +Tie_column::calc_positioning_done (SCM smob) { - return sign (Tie::position_f (s1) - Tie::position_f (s2)); -} - -/* - See [Ross p. 138]. + Grob *me = unsmob_grob (smob); + extract_grob_set (me, "ties", ro_ties); + Link_array ties (ro_ties); + if (!ties.size ()) + return SCM_BOOL_T; + if (ties.size() == 1) + { + /* + Already handled by standard mechanisms. + */ + return SCM_BOOL_T; + } + + ties.sort (&Tie::compare); - In normal chord cases, the outer ties point outwards, and the - direction of the rest is determined by their staff position. + Tie_formatting_problem problem; + problem.from_ties (ties); - Ross forgets about the tie that is *on* the middle staff line. We - assume it goes UP. (TODO: make me settable) */ -void -Tie_column::set_directions (Grob*me) -{ - Link_array ties = - Pointer_group_interface__extract_elements (me, (Grob*)0, "ties"); + SCM manual_configs = me->get_property ("tie-configuration"); + problem.set_manual_tie_configuration (manual_configs); - for (int i = ties.size (); i--;) - if (Directional_element_interface::get (ties[i])) - ties.del (i); - - if (!ties.size ()) - return ; - + Ties_configuration base = problem.generate_optimal_chord_configuration (); - Direction d = Directional_element_interface::get (me); - if (d) - { - for (int i = ties.size (); i--;) - { - Grob * t = ties[i]; - Directional_element_interface::set (t, d); - } - return; - } - - if (ties.size () == 1) + for (int i = 0; i < base.size(); i++) { - Grob * t = ties[0]; - Directional_element_interface::set (t,Tie::get_default_dir (t)); - return; + Tie::set_control_points (ties[i], problem.common_x_refpoint (), + base[i], + problem.details_); + set_grob_direction (ties[i], + base[i].dir_); } - - ties.sort (tie_compare); - Directional_element_interface::set (ties[0], DOWN); - ties.del (0); - - Directional_element_interface ::set (ties.pop (), UP); - for (int i=ties.size (); i--;) - { - Grob * t = ties[i]; - Real p = Tie::position_f (t); - Direction d = (Direction) sign (p); - if (!d) - d = UP; - Directional_element_interface::set (t, d); - } - + return SCM_BOOL_T; } -MAKE_SCHEME_CALLBACK (Tie_column,after_line_breaking,1); -SCM -Tie_column::after_line_breaking (SCM smob) -{ - set_directions (unsmob_grob (smob)); - return SCM_UNSPECIFIED; -} + + +ADD_INTERFACE (Tie_column, "tie-column-interface", + "Object that sets directions of multiple ties in a tied chord", + + /* properties */ + "positioning-done " + "tie-configuration " + ); +