X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie.cc;h=0c03c0fcb55d7acd7e507fdca89c772fec30c8b1;hb=df742c1dd6dc55a68167fe47b2aab85c439b68f5;hp=e0c17aa912c3124f4cb16eb07d38eeaf9511f4cc;hpb=8ee72795e81c227359ae720d8fac7fc3e68d170f;p=lilypond.git diff --git a/lily/tie.cc b/lily/tie.cc index e0c17aa912..0c03c0fcb5 100644 --- a/lily/tie.cc +++ b/lily/tie.cc @@ -3,33 +3,37 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2006 Han-Wen Nienhuys + (c) 1997--2007 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 "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); @@ -119,7 +132,9 @@ Tie::get_default_dir (Grob *me) 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; } @@ -130,22 +145,23 @@ 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) { /* 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,16 +173,19 @@ Tie::set_default_control_points (Grob *me_grob) 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); - set_control_points (me, problem.common_x_refpoint (), - conf, problem.details_); + return get_control_points (me, problem.common_x_refpoint (), + conf, 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 @@ -182,9 +201,10 @@ 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); SCM Tie::calc_control_points (SCM smob) @@ -195,7 +215,8 @@ Tie::calc_control_points (SCM smob) (void) get_grob_direction (me); 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) { @@ -203,12 +224,13 @@ Tie::calc_control_points (SCM smob) (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; } /* @@ -228,7 +250,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++; @@ -248,12 +270,28 @@ Tie::print (SCM smob) 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" , @@ -265,10 +303,16 @@ ADD_INTERFACE (Tie, "dash-period " "details " "direction " + "separation-item " + "head-direction " "line-thickness " + "quant-score " + "staff-position " "thickness " + ); +