X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Ftie.cc;h=87548a7056c538bb32867091085c5a2a7cf675cd;hb=2b695bcbe3d6a5fddd58eb03189d3272112421d9;hp=e6c1902d778a42d470edcca27b166a10380f35f4;hpb=ad4297de0246935caa4c51f4e152e20009a6f64e;p=lilypond.git diff --git a/lily/tie.cc b/lily/tie.cc index e6c1902d77..87548a7056 100644 --- a/lily/tie.cc +++ b/lily/tie.cc @@ -3,191 +3,321 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1999 Han-Wen Nienhuys + (c) 1997--2007 Han-Wen Nienhuys */ -#include "paper-def.hh" #include "tie.hh" + +#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 "debug.hh" - - - -void -Tie::set_head (Direction d, Note_head * head_l) +#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" +#include "semi-tie-column.hh" + + +bool +Tie::less (Grob *const &s1, + Grob *const &s2) { - assert (!head_l_drul_[d]); - head_l_drul_[d] = head_l; - set_bounds (d, head_l); - - add_dependency (head_l); + return Tie::get_position (s1) < Tie::get_position (s2); } -Tie::Tie() +void +Tie::set_head (Grob *me, Direction d, Grob *h) { - head_l_drul_[RIGHT] =0; - head_l_drul_[LEFT] =0; + dynamic_cast (me)->set_bound (d, h); } - -/* - ugh: direction of the Tie is more complicated. See [Ross] p136 and further - */ -Direction -Tie::get_default_dir () const +Grob * +Tie::head (Grob *me, Direction d) { - int m = (head_l_drul_[LEFT]->position_i_ - + head_l_drul_[RIGHT]->position_i_) /2; - /* - If dir is not determined: inverse of stem: down - (see stem::get_default_dir ()) - */ - return (m <= 0)? DOWN : UP; + 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; + else + return 0; } -void -Tie::do_add_processing() +int +Tie::get_column_rank (Grob *me, Direction d) { - if (!(head_l_drul_[LEFT] && head_l_drul_[RIGHT])) - warning (_ ("lonely tie")); + Spanner *span = dynamic_cast (me); + Grob *h = head (me, d); + if (!h) + h = span->get_bound (d); - Direction d = LEFT; - Drul_array new_head_drul = head_l_drul_; - do { - if (!head_l_drul_[d]) - new_head_drul[d] = head_l_drul_[(Direction)-d]; - } while (flip(&d) != LEFT); - head_l_drul_ = new_head_drul; + Grob *col = dynamic_cast (h)->get_column (); + return Paper_column::get_rank (col); } -void -Tie::do_post_processing() +int +Tie::get_position (Grob *me) { - assert (head_l_drul_[LEFT] || head_l_drul_[RIGHT]); - - Real interline_f = paper_l ()->get_realvar (interline_scm_sym); - Real internote_f = interline_f / 2; - Real x_gap_f = paper_l ()->get_var ("tie_x_gap"); - Real y_gap_f = paper_l ()->get_var ("tie_y_gap"); + Direction d = LEFT; + do + { + Grob *h = head (me, d); + if (h) + return (int) rint (Staff_symbol_referencer::get_position (h)); + } + while (flip (&d) != LEFT); - /* - Slur and tie placement [OSU] + /* - Ties: + 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; +} - * x = inner vertical tangent - d * gap +/* + 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). - /* - OSU: not different for outer notes, so why all this code? - ie, can we drop this, or should it be made switchable. - */ -#if 0 + (what about linebreaks? ) +*/ +Direction +Tie::get_default_dir (Grob *me) +{ + Drul_array stems; Direction d = LEFT; do { - Real head_width_f = head_l_drul_[d] - ? head_l_drul_[d]->extent (X_AXIS).length () - : 0; - /* - side attached to outer (upper or lower) notehead of chord - */ - if (head_l_drul_[d] - /* - && head_l_drul_[d]->remove_elt_property (extremal_scm_sym) != SCM_BOOL_F) - ugh, ugh: - - a~a~a; - - to second tie, middle notehead seems not extremal - - Getting scared a bit by score-element's comment: - // is this a good idea? - */ - && (head_l_drul_[d]->get_elt_property (extremal_scm_sym) - != SCM_BOOL_F)) - { - if (d == LEFT) - dx_f_drul_[d] += head_width_f; - dx_f_drul_[d] += -d * x_gap_f; - } - /* - side attached to inner notehead - */ - else - { - dx_f_drul_[d] += -d * head_width_f; - } - } while (flip (&d) != LEFT); + Grob *stem = head (me, d) ? Rhythmic_head::get_stem (head (me, d)) : 0; + if (stem) + stem = Stem::is_invisible (stem) ? 0 : stem; -#else - - if (head_l_drul_[LEFT]) - dx_f_drul_[LEFT] = head_l_drul_[LEFT]->extent (X_AXIS).length (); - dx_f_drul_[LEFT] += x_gap_f; - dx_f_drul_[RIGHT] -= x_gap_f; + 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; +} -#endif - /* - Slur and tie placement [OSU] -- check this +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) + || Semi_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"); - Ties: + return me->get_property_data ("direction"); + } + else + return scm_from_int (Tie::get_default_dir (me)); +} - * y = dx < 5ss: horizontal tangent - y = dx >= 5ss: y next interline - d * 0.25 ss - which probably means that OSU assumes that +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); + + Tie_formatting_problem problem; + problem.from_tie (me); + + Tie_specification spec = problem.get_tie_specification (0); + if (!me->is_live ()) + return SCM_EOL; - dy <= 5 dx + + Ties_configuration conf + = problem.generate_optimal_configuration (); + + return get_control_points (me, problem.common_x_refpoint (), + conf[0], problem.details_); +} - for smal slurs - */ +SCM +Tie::get_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)); - int ypos_i = head_l_drul_[LEFT] ? head_l_drul_[LEFT]->position_i_ - : head_l_drul_[RIGHT]->position_i_; + 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); + } + return controls; +} - Real y_f = internote_f * ypos_i; - Real dx_f = extent (X_AXIS).length () + dx_f_drul_[RIGHT] - dx_f_drul_[LEFT]; - if (dx_f < paper_l ()->get_var ("tie_staffspace_length")) +MAKE_SCHEME_CALLBACK (Tie, calc_control_points, 1); +SCM +Tie::calc_control_points (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)) + && unsmob_grob_array (yparent->get_object ("ties")) + // && unsmob_grob_array (yparent->get_object ("ties"))->size () > 1 + ) { - if (abs (ypos_i) % 2) - y_f += dir_ * internote_f; - y_f += dir_ * y_gap_f; + /* trigger positioning. */ + (void) yparent->get_property ("positioning-done"); } - else + + SCM cp = me->get_property_data ("control-points"); + if (!scm_is_pair (cp)) { - if (! (abs (ypos_i) % 2)) - y_f += dir_ * internote_f; - y_f += dir_ * internote_f; - y_f -= dir_ * y_gap_f; + cp = get_default_control_points (me); } - - dy_f_drul_[LEFT] = dy_f_drul_[RIGHT] = y_f; + + return cp; } -void -Tie::do_substitute_element_pointer (Score_element*o, Score_element*n) +/* + TODO: merge with Slur::print. + */ +MAKE_SCHEME_CALLBACK (Tie, print, 1); +SCM +Tie::print (SCM smob) { - Note_head *new_l = n ? dynamic_cast (n) : 0; - if (dynamic_cast (o) == head_l_drul_[LEFT]) - head_l_drul_[LEFT] = new_l; - else if (dynamic_cast (o) == head_l_drul_[RIGHT]) - head_l_drul_[RIGHT] = new_l; -} + 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); -Array -Tie::get_rods () const -{ - Array a; - Rod r; - r.item_l_drul_ = spanned_drul_; - r.distance_f_ = paper_l ()->get_var ("tie_x_minimum"); - a.push (r); - return a; + Bezier b; + int i = 0; + for (SCM s = cp; scm_is_pair (s); 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 (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 + + return a.smobbed_copy (); } + +ADD_INTERFACE (Tie, + "A horizontal curve connecting two noteheads. \n\n" + , + + + /* properties */ + "avoid-slur " // UGH. + "control-points " + "dash-fraction " + "dash-period " + "details " + "direction " + "separation-item " + "head-direction " + "line-thickness " + "quant-score " + "staff-position " + "thickness " + + ); + + + + +