X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie.cc;h=a4c5aaa929a8dc0aa9f285741cedaf3006b18d24;hb=0387f04497978e37b335a8b99eec905499d6ad0f;hp=daf09ecdab02b3edc1f04437dcf145fc96c30a92;hpb=76f13ab50fc726c89fa7c96f3deed519d2d773dc;p=lilypond.git diff --git a/lily/tie.cc b/lily/tie.cc index daf09ecdab..f02cddacf8 100644 --- a/lily/tie.cc +++ b/lily/tie.cc @@ -3,264 +3,332 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2008 Han-Wen Nienhuys */ -#include -#include "lookup.hh" -#include "paper-def.hh" #include "tie.hh" -#include "note-head.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" +#include "pointer-group-interface.hh" +#include "rhythmic-head.hh" +#include "spanner.hh" #include "staff-symbol-referencer.hh" -#include "directional-element-interface.hh" -#include "molecule.hh" -#include "bezier-bow.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" -void -Tie::set_head (Direction d, Item * head_l) -{ - assert (!head (d)); - index_set_cell (get_elt_pointer ("heads"), d, head_l->self_scm_); - - set_bound (d, head_l); - add_dependency (head_l); -} -Tie::Tie(SCM s) - : Spanner (s) +bool +Tie::less (Grob *const &s1, Grob *const &s2) { - set_elt_pointer ("heads", gh_cons (SCM_EOL, SCM_EOL)); - dy_f_drul_[LEFT] = dy_f_drul_[RIGHT] = 0.0; - dx_f_drul_[LEFT] = dx_f_drul_[RIGHT] = 0.0; - + return Tie::get_position (s1) < Tie::get_position (s2); } -Note_head* -Tie::head (Direction d) const -{ - SCM c = get_elt_pointer ("heads"); - c = index_cell (c, d); - - return dynamic_cast (unsmob_element (c)); -} - -Real -Tie::position_f () const +void +Tie::set_head (Grob *me, Direction d, Grob *h) { - return head (LEFT) - ? staff_symbol_referencer (head (LEFT)).position_f () - : staff_symbol_referencer (head (RIGHT)).position_f () ; + 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) { - Stem * sl = head(LEFT) ? head (LEFT)->stem_l () :0; - Stem * sr = head(RIGHT) ? head (RIGHT)->stem_l () :0; - - if (sl && directional_element (sl).get () == UP - && sr && directional_element (sr).get () == UP) - return DOWN; + 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 UP; + return 0; } -void -Tie::do_add_processing() +int +Tie::get_column_rank (Grob *me, Direction d) { - if (!(head (LEFT) && head (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; - new_head_drul[LEFT] = head(LEFT); - new_head_drul[RIGHT] = head(RIGHT); - do { - if (!head (d)) - new_head_drul[d] = head((Direction)-d); - } while (flip(&d) != LEFT); - - index_set_cell (get_elt_pointer ("heads"), LEFT, new_head_drul[LEFT]->self_scm_ ); - index_set_cell (get_elt_pointer ("heads"), RIGHT, new_head_drul[RIGHT]->self_scm_ ); + Grob *col = dynamic_cast (h)->get_column (); + return Paper_column::get_rank (col); } -void -Tie::after_line_breaking () +int +Tie::get_position (Grob *me) { - if (!head (LEFT) && !head (RIGHT)) + Direction d = LEFT; + do { - programming_error ("Tie without heads."); - set_elt_property ("transparent", SCM_BOOL_T); - set_extent_callback (0, X_AXIS); - set_extent_callback (0, Y_AXIS); - return; + Grob *h = head (me, d); + if (h) + return (int) rint (Staff_symbol_referencer::get_position (h)); } - - if (!directional_element (this).get ()) - directional_element (this).set (get_default_dir ()); - - Real staff_space = staff_symbol_referencer (this).staff_space (); - Real half_space = staff_space / 2; - Real x_gap_f = paper_l ()->get_var ("tie_x_gap"); - Real y_gap_f = paper_l ()->get_var ("tie_y_gap"); - - /* - Slur and tie placement [OSU] - - Ties: - - * x = inner vertical tangent - d * gap - - */ - + while (flip (&d) != LEFT); /* - OSU: not different for outer notes, so why all this code? - ie, can we drop this, or should it be made switchable. - */ - if (head (LEFT)) - dx_f_drul_[LEFT] = head (LEFT)->extent (X_AXIS).length (); - else - dx_f_drul_[LEFT] = get_broken_left_end_align (); - dx_f_drul_[LEFT] += x_gap_f; - dx_f_drul_[RIGHT] -= x_gap_f; - - /* - Slur and tie placement [OSU] -- check this - Ties: - - * y = dx < 5ss: horizontal tangent - y = dx >= 5ss: y next interline - d * 0.25 ss - - which probably means that OSU assumes that - - dy <= 5 dx + 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; +} - for smal slurs - */ +/* + Default: Put the tie oppositie of the stem [Wanske p231] + In case of chords: Tie_column takes over - Real ypos = position_f (); + The direction of the Tie is more complicated (See [Ross] p136 and + further). - Real y_f = half_space * ypos; - int ypos_i = int (ypos); - - Real dx_f = extent (X_AXIS).length () + dx_f_drul_[RIGHT] - dx_f_drul_[LEFT]; - Direction dir = directional_element (this).get(); - if (dx_f < paper_l ()->get_var ("tie_staffspace_length")) + (what about linebreaks? ) +*/ +Direction +Tie::get_default_dir (Grob *me) +{ + Drul_array stems; + Direction d = LEFT; + do { - if (abs (ypos_i) % 2) - y_f += dir * half_space; - y_f += dir * y_gap_f; + 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; } - else + 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]) { - if (! (abs (ypos_i) % 2)) - y_f += dir * half_space; - y_f += dir * half_space; - y_f -= dir * y_gap_f; + Grob *s = stems[LEFT] ? stems[LEFT] : stems[RIGHT]; + return -get_grob_direction (s); } + else if (int p = get_position (me)) + return Direction (sign (p)); - dy_f_drul_[LEFT] = dy_f_drul_[RIGHT] = y_f; + return to_dir (me->get_property("neutral-direction")); } - -Array -Tie::get_rods () const +MAKE_SCHEME_CALLBACK (Tie, calc_direction, 1); +SCM +Tie::calc_direction (SCM smob) { - Array a; - Rod r; + 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"); - r.item_l_drul_ [LEFT]=get_bound (LEFT); - r.item_l_drul_ [RIGHT]=get_bound (RIGHT); - - r.distance_f_ = paper_l ()->get_var ("tie_x_minimum"); - a.push (r); - return a; + return me->get_property_data ("direction"); + } + else + return scm_from_int (Tie::get_default_dir (me)); } +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; + + Ties_configuration conf + = problem.generate_optimal_configuration (); + + return get_control_points (me, problem.common_x_refpoint (), + conf[0], problem.details_); +} -Molecule -Tie::do_brew_molecule () const +SCM +Tie::get_control_points (Grob *me, + Grob *common, + Tie_configuration const &conf, + Tie_details const &details + ) { - Real thick = paper_l ()->get_var ("tie_thickness"); - Bezier one = get_curve (); + Bezier b = conf.get_transformed_bezier (details); + b.translate (Offset (- me->relative_coordinate (common, X_AXIS), 0)); - Molecule a; - SCM d = get_elt_property ("dashed"); - if (gh_number_p (d)) - a = lookup_l ()->dashed_slur (one, thick, gh_scm2int (d)); - else - a = lookup_l ()->slur (one, directional_element (this).get () * thick, thick); - - return a; + 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; } +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"))) + { + 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"); + } + + SCM cp = me->get_property_data ("control-points"); + if (!scm_is_pair (cp)) + { + cp = get_default_control_points (me); + } + return cp; +} -Bezier -Tie::get_curve () const +/* + TODO: merge with Slur::print. + */ +MAKE_SCHEME_CALLBACK (Tie, print, 1); +SCM +Tie::print (SCM smob) { - Direction d (directional_element (this).get ()); - Bezier_bow b (get_encompass_offset_arr (), d); + Grob *me = unsmob_grob (smob); + + SCM cp = me->get_property ("control-points"); - Real staff_space = staff_symbol_referencer (this).staff_space (); - Real h_inf = paper_l ()->get_var ("tie_height_limit_factor") * staff_space; - Real r_0 = paper_l ()->get_var ("tie_ratio"); + 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); - b.set_default_bezier (h_inf, r_0); - Bezier c = b.get_bezier (); + 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; - /* should do this for slurs as well. */ - Array horizontal (c.solve_derivative (Offset (1,0))); + 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 (horizontal.size ()) +#if DEBUG_TIE_SCORING + SCM annotation = me->get_property ("annotation"); + if (!scm_is_string (annotation)) { - /* - ugh. Doesnt work for non-horizontal curves. - */ - Real y = c.curve_point (horizontal[0])[Y_AXIS]; + 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); - Real ry = rint (y/staff_space) * staff_space; - Real diff = ry - y; - Real newy = y; - if (fabs (y) <= 2.0 - && fabs (diff) < paper_l ()->get_var ("tie_staffline_clearance")) - { - newy = ry - 0.5 * staff_space * sign (diff) ; - } + 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); - Real y0 = c.control_ [0][Y_AXIS]; - c.control_[2][Y_AXIS] = - c.control_[1][Y_AXIS] = - (c.control_[1][Y_AXIS] - y0) * ((newy - y0) / (y - y0)) + y0; + /* + 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); } - else - programming_error ("Tie is nowhere horizontal"); - return c; -} +#endif -Array -Tie::get_encompass_offset_arr () const -{ - Array offset_arr; - offset_arr.push (Offset (dx_f_drul_[LEFT], dy_f_drul_[LEFT])); - offset_arr.push (Offset (spanner_length () + dx_f_drul_[RIGHT], - dy_f_drul_[RIGHT])); - - return offset_arr; + return a.smobbed_copy (); } +ADD_INTERFACE (Tie, + "A horizontal curve connecting two noteheads.", + + /* 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 " + ); + + + +