X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie.cc;h=f02cddacf84a8f107cc637dcf72121c3c48332eb;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=76d1b65b364adb422f26a7e8dfec1519014e56fd;hpb=3daaf5e7a27834e38c51ee14b5918decd0d974b4;p=lilypond.git diff --git a/lily/tie.cc b/lily/tie.cc index 76d1b65b36..f02cddacf8 100644 --- a/lily/tie.cc +++ b/lily/tie.cc @@ -3,33 +3,37 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2005 Han-Wen Nienhuys + (c) 1997--2008 Han-Wen Nienhuys */ #include "tie.hh" -#include "spanner.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 "rhythmic-head.hh" -#include "bezier.hh" #include "paper-column.hh" -#include "warn.hh" +#include "pointer-group-interface.hh" +#include "rhythmic-head.hh" +#include "spanner.hh" #include "staff-symbol-referencer.hh" -#include "directional-element-interface.hh" -#include "bezier.hh" #include "stem.hh" -#include "note-head.hh" +#include "text-interface.hh" #include "tie-column.hh" -#include "grob-array.hh" -#include "tie-formatting-problem.hh" #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 @@ -41,6 +45,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; @@ -68,7 +81,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); @@ -96,46 +109,64 @@ Tie::get_position (Grob *me) Direction Tie::get_default_dir (Grob *me) { - Item *sl = head (me, LEFT) ? Rhythmic_head::get_stem (head (me, LEFT)) : 0; - Item *sr = head (me, RIGHT) ? Rhythmic_head::get_stem (head (me, RIGHT)) : 0; - if (sl && sr) + 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); + + 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); + + if (stems[LEFT] && stems[RIGHT]) { - if (get_grob_direction (sl) == UP - && get_grob_direction (sr) == UP) + if (get_grob_direction (stems[LEFT]) == UP + && get_grob_direction (stems[RIGHT]) == UP) return DOWN; } - else if (sl || sr) + else if (stems[LEFT] || stems[RIGHT]) { - Item *s = sl ? sl : sr; + 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; @@ -145,16 +176,20 @@ Tie::set_default_control_points (Grob *me_grob) Tie_formatting_problem problem; problem.from_tie (me); - // get_configuration (me, &conf, problem); - int tie_position = (int) Tie::get_position (me); - Tie_configuration conf - = problem.find_optimal_tie_configuration (tie_position, get_grob_direction (me)); - set_control_points (me, problem.common_x_refpoint (), - conf, problem.details_); + 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_); } -void -Tie::set_control_points (Grob *me, +SCM +Tie::get_control_points (Grob *me, Grob *common, Tie_configuration const &conf, Tie_details const &details @@ -170,36 +205,44 @@ 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 with Slur::print. + */ MAKE_SCHEME_CALLBACK (Tie, print, 1); SCM Tie::print (SCM smob) @@ -209,12 +252,12 @@ Tie::print (SCM smob) SCM cp = me->get_property ("control-points"); Real staff_thick = Staff_symbol_referencer::line_thickness (me); - Real base_thick = robust_scm2double (me->get_property ("thickness"), 1); - Real thick = base_thick * staff_thick; + 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)) + for (SCM s = cp; scm_is_pair (s); s = scm_cdr (s)) { b.control_[i] = ly_scm2offset (scm_car (s)); i++; @@ -226,33 +269,65 @@ Tie::print (SCM smob) SCM f = me->get_property ("dash-fraction"); if (scm_is_number (p) && scm_is_number (f)) a = Lookup::dashed_slur (b, - thick, + line_thick, robust_scm2double (p, 1.0), robust_scm2double (f, 0)); else a = Lookup::slur (b, - get_grob_direction (me) * staff_thick, - thick); + get_grob_direction (me) * base_thick, + line_thick); + +#if DEBUG_TIE_SCORING + 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, + 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 return a.smobbed_copy (); } ADD_INTERFACE (Tie, - "tie-interface", + "A horizontal curve connecting two noteheads.", - "A tie connecting two noteheads. \n\n" - , - - /* properties */ + "annotation " "avoid-slur " // UGH. "control-points " "dash-fraction " "dash-period " "details " "direction " + "head-direction " + "line-thickness " + "neutral-direction " + "quant-score " + "separation-item " + "staff-position " "thickness " - "x-gap "); + ); +