X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie.cc;h=3f282071e77fe393bad531df74895ef3a97ef840;hb=e012a172277f78d4954d269fd4973ad3fd6e5d60;hp=5c71c9d133bd27028600c0813b9116e2f88f9342;hpb=52102901e53611ad7bad111c2f9d414d2e593bc3;p=lilypond.git diff --git a/lily/tie.cc b/lily/tie.cc index 5c71c9d133..3f282071e7 100644 --- a/lily/tie.cc +++ b/lily/tie.cc @@ -1,85 +1,301 @@ /* tie.cc -- implement Tie - source file of the LilyPond music typesetter + source file of the GNU LilyPond music typesetter - (c) 1997 Han-Wen Nienhuys + (c) 1997--2006 Han-Wen Nienhuys */ -#include "paper-def.hh" #include "tie.hh" -#include "notehead.hh" -#include "p-col.hh" -Spanner* -Tie::do_break_at(PCol*l, PCol*r) const +#include "main.hh" +#include "bezier.hh" +#include "directional-element-interface.hh" +#include "font-interface.hh" +#include "grob-array.hh" +#include "lookup.hh" +#include "note-head.hh" +#include "output-def.hh" +#include "paper-column.hh" +#include "rhythmic-head.hh" +#include "spanner.hh" +#include "staff-symbol-referencer.hh" +#include "stem.hh" +#include "text-interface.hh" +#include "tie-column.hh" +#include "tie-configuration.hh" +#include "tie-formatting-problem.hh" +#include "warn.hh" + + +int +Tie::compare (Grob *const &s1, + Grob *const &s2) { - Tie * tie_p = new Tie(*this); - Line_of_score const *line_C=l->line_l_; - tie_p->left_head_l_ = (left_head_l_->line_l()== line_C) ? - left_head_l_ : 0; - tie_p->right_head_l_ = (right_head_l_->line_l() == line_C)? - right_head_l_ : 0; - - return tie_p; + return sign (Tie::get_position (s1) - Tie::get_position (s2)); } void -Tie::set_head(int x_pos, Notehead * head_l) +Tie::set_head (Grob *me, Direction d, Grob *h) +{ + dynamic_cast (me)->set_bound (d, h); +} + +Grob * +Tie::head (Grob *me, Direction d) +{ + Item *it = dynamic_cast (me)->get_bound (d); + if (Note_head::has_interface (it)) + return it; + else + return 0; +} + +int +Tie::get_column_rank (Grob *me, Direction d) { - if (x_pos >0) { - assert(!right_head_l_); - right_head_l_ = head_l; - } else { - assert(!left_head_l_); - left_head_l_ = head_l; + Spanner *span = dynamic_cast (me); + Grob *h = head (me, d); + if (!h) + h = span->get_bound (d); + + Grob *col = dynamic_cast (h)->get_column (); + return Paper_column::get_rank (col); +} + +int +Tie::get_position (Grob *me) +{ + Direction d = LEFT; + do + { + Grob *h = head (me, d); + if (h) + return (int) rint (Staff_symbol_referencer::get_position (h)); } - add_dependency(head_l); + 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; } -Tie::Tie() +/* + 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 (Grob *me) { - right_head_l_ =0; - left_head_l_ =0; - same_pitch_b_ =false; + Drul_array stems; + Direction d = LEFT; + do + { + Grob *stem = head (me, d) ? Rhythmic_head::get_stem (head (me, d)) : 0; + if (stem) + stem = Stem::is_invisible (stem) ? 0 : stem; + + stems[d] = stem; + } + while (flip (&d)!= LEFT); + + if (stems[LEFT] && stems[RIGHT]) + { + if (get_grob_direction (stems[LEFT]) == UP + && get_grob_direction (stems[RIGHT]) == UP) + return DOWN; + } + else if (stems[LEFT] || stems[RIGHT]) + { + Grob *s = stems[LEFT] ? stems[LEFT] : stems[RIGHT]; + return -get_grob_direction (s); + } + else if (int p = get_position (me)) + return Direction (sign (p)); + + return UP; } -void -Tie::set_default_dir() + +MAKE_SCHEME_CALLBACK(Tie, calc_direction, 1); +SCM +Tie::calc_direction (SCM smob) { - int m= (left_head_l_->position_i_ + right_head_l_->position_i_) /2 ; - dir_i_ = (m < 5)? -1:1; // ugh + 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) + { + /* trigger positioning. */ + (void) yparent->get_property ("positioning-done"); + } + else + set_grob_direction (me, Tie::get_default_dir (me)); + + return SCM_UNSPECIFIED; } - + void -Tie::do_add_processing() +Tie::set_default_control_points (Grob *me_grob) { - assert(left_head_l_ && right_head_l_); - left_col_l_ = left_head_l_ -> pcol_l_; - right_col_l_ = right_head_l_ -> pcol_l_; -} + 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); + spec.has_manual_dir_ = true; + spec.manual_dir_ = get_grob_direction (me); + if (me->is_live ()) + { + Tie_configuration conf + = problem.find_optimal_tie_configuration (spec); + + set_control_points (me, problem.common_x_refpoint (), + conf, problem.details_); + } +} void -Tie::do_post_processing() +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)); + + 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); +} + +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) + { + /* trigger positioning. */ + (void) yparent->get_property ("positioning-done"); + } + + if (!scm_is_pair (me->get_property_data (ly_symbol2scm ("control-points")))) + { + set_default_control_points (me); + } + + return SCM_UNSPECIFIED; +} + +/* + TODO: merge witnh Slur::print. + */ +MAKE_SCHEME_CALLBACK (Tie, print, 1); +SCM +Tie::print (SCM smob) { - assert(left_head_l_ || right_head_l_); - left_pos_i_ = (left_head_l_)? - left_head_l_->position_i_ : right_head_l_->position_i_; - right_pos_i_ = (right_head_l_) ? - right_head_l_->position_i_ : left_head_l_->position_i_; - - if ( right_head_l_ && right_head_l_->extremal_i_) { - right_pos_i_ += 2*dir_i_; - right_dx_f_ -= 0.25; - } else - right_dx_f_ -= 0.5; - - if (left_head_l_ && left_head_l_->extremal_i_) { - left_pos_i_ += 2*dir_i_; - left_dx_f_ += 0.25; - } else - left_dx_f_ += 0.5; + Grob *me = unsmob_grob (smob); + + SCM cp = me->get_property ("control-points"); + + Real staff_thick = Staff_symbol_referencer::line_thickness (me); + Real base_thick = staff_thick * robust_scm2double (me->get_property ("thickness"), 1); + Real line_thick = staff_thick * robust_scm2double (me->get_property ("line-thickness"), 1); + + Bezier b; + int i = 0; + for (SCM s = cp; s != SCM_EOL; s = scm_cdr (s)) + { + b.control_[i] = ly_scm2offset (scm_car (s)); + i++; + } + + 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); + +#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)) + { + 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); + } +#endif + + return a.smobbed_copy (); } +ADD_INTERFACE (Tie, + "tie-interface", + + "A horizontal curve connecting two noteheads. \n\n" + , + + + /* properties */ + "avoid-slur " // UGH. + "control-points " + "dash-fraction " + "dash-period " + "details " + "direction " + "line-thickness " + "quant-score " + "staff-position " + "thickness " + ); + + +