X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur.cc;h=bade56d2e36438cc51cb7ddeb81951bf3340cbeb;hb=1f0d3e5ed0e3b1f0a21a7d64e5b9c7e27bba4f5a;hp=dcdea460abac9b9b24c6fa45590d161aa52a6d93;hpb=f7f4d9dcd37086b5c8b417719a0fcc924aceef92;p=lilypond.git diff --git a/lily/slur.cc b/lily/slur.cc index dcdea460ab..bade56d2e3 100644 --- a/lily/slur.cc +++ b/lily/slur.cc @@ -30,7 +30,7 @@ #include "stem.hh" #include "paper-column.hh" #include "molecule.hh" -#include "debug.hh" +#include "warn.hh" #include "slur-bezier-bow.hh" #include "main.hh" #include "group-interface.hh" @@ -50,12 +50,10 @@ void Slur::add_column (Grob*me, Grob*n) { if (!gh_pair_p (n->get_grob_property ("note-heads"))) - me->warning (_ ("Putting slur over rest. Ignoring rest.")); - else - { - Pointer_group_interface::add_grob (me, ly_symbol2scm ("note-columns"), n); - me->add_dependency (n); - } + me->warning (_ ("Putting slur over rest.")); + + Pointer_group_interface::add_grob (me, ly_symbol2scm ("note-columns"), n); + me->add_dependency (n); add_bound_item (dynamic_cast (me), dynamic_cast (n)); } @@ -93,16 +91,18 @@ Slur::de_uglyfy (Grob*me, Slur_bezier_bow* bb, Real default_height) bb->curve_.assert_sanity (); } + + Direction Slur::get_default_dir (Grob*me) { - Link_array encompass_arr = + Link_array encompasses = Pointer_group_interface__extract_grobs (me, (Grob*)0, "note-columns"); Direction d = DOWN; - for (int i=0; i < encompass_arr.size (); i ++) + for (int i=0; i < encompasses.size (); i ++) { - if (Note_column::dir (encompass_arr[i]) < 0) + if (Note_column::dir (encompasses[i]) < 0) { d = UP; break; @@ -131,13 +131,14 @@ Slur::after_line_breaking (SCM smob) void Slur::check_slope (Grob *me) { + /* Avoid too steep slurs. */ SCM s = me->get_grob_property ("slope-limit"); if (gh_number_p (s)) { - Array encompass = get_encompass_offset_arr (me); + Array encompass = get_encompass_offsets (me); Drul_array attachment; attachment[LEFT] = encompass[0]; attachment[RIGHT] = encompass.top (); @@ -158,8 +159,8 @@ Slur::check_slope (Grob *me) Direction d = (Direction) (- dir * (sign (dy))); SCM a = me->get_grob_property ("attachment-offset"); Drul_array o; - o[LEFT] = ly_scm2offset (index_cell (a, LEFT)); - o[RIGHT] = ly_scm2offset (index_cell (a, RIGHT)); + o[LEFT] = ly_scm2offset (index_get_cell (a, LEFT)); + o[RIGHT] = ly_scm2offset (index_get_cell (a, RIGHT)); o[d][Y_AXIS] -= (limit - slope) * dx * dir / staff_space; o[d][Y_AXIS] *= Directional_element_interface::get (me); @@ -169,6 +170,7 @@ Slur::check_slope (Grob *me) ly_offset2scm (o[RIGHT]))); } } + } /* @@ -194,7 +196,7 @@ Slur::set_extremities (Grob *me) do { - if (!gh_symbol_p (index_cell (att, dir))) + if (!gh_symbol_p (index_get_cell (att, dir))) { for (SCM s = me->get_grob_property ("extremity-rules"); s != SCM_EOL; s = ly_cdr (s)) @@ -221,12 +223,19 @@ Slur::set_extremities (Grob *me) Real Slur::get_first_notecolumn_y (Grob *me, Direction dir) { - Grob *col = dir == LEFT - ? unsmob_grob (ly_car (scm_reverse (me->get_grob_property - ("note-columns")))) - : unsmob_grob - (ly_car (me->get_grob_property ("note-columns"))); + SCM cols = me->get_grob_property ("note-columns"); + + if(!gh_pair_p (cols)) + { + programming_error ("No note-columns in slur?"); + me->suicide (); + return 0.0; + } + if (dir == LEFT) + cols = scm_reverse(cols); + + Grob *col = unsmob_grob (ly_car (cols)); Grob *common[] = { 0, @@ -253,15 +262,15 @@ Slur::broken_trend_offset (Grob *me, Direction dir) the unbroken slur would have had. */ Offset o; - if (Spanner *mother = dynamic_cast (me->original_l_)) + if (Spanner *mother = dynamic_cast (me->original_)) { - for (int i = dir == LEFT ? 0 : mother->broken_into_l_arr_.size () - 1; - dir == LEFT ? i < mother->broken_into_l_arr_.size () : i > 0; + for (int i = dir == LEFT ? 0 : mother->broken_intos_.size () - 1; + dir == LEFT ? i < mother->broken_intos_.size () : i > 0; dir == LEFT ? i++ : i--) { - if (mother->broken_into_l_arr_[i - dir] == me) + if (mother->broken_intos_[i - dir] == me) { - Grob *neighbour = mother->broken_into_l_arr_[i]; + Grob *neighbour = mother->broken_intos_[i]; if (dir == RIGHT) neighbour->set_grob_property ("direction", me->get_grob_property ("direction")); @@ -278,12 +287,17 @@ Slur::broken_trend_offset (Grob *me, Direction dir) return o; } +/* + COMMON is size-2 array with common refpoints. + +UGH: this routine delivers offsets which are *not* relative to COMMON. +*/ Offset Slur::get_attachment (Grob *me, Direction dir, Grob **common) { SCM s = me->get_grob_property ("attachment"); - if (!gh_symbol_p (index_cell (s, dir))) + if (!gh_symbol_p (index_get_cell (s, dir))) { s = set_extremities (me); } @@ -301,7 +315,7 @@ Slur::get_attachment (Grob *me, Direction dir, if (Note_column::has_interface (sp->get_bound (dir))) { Grob * n =sp->get_bound (dir); - if ((stem = Note_column::stem_l (n))) + if ((stem = Note_column::get_stem (n))) { Real x_extent; if (Grob *head = Note_column::first_head (n)) @@ -322,7 +336,7 @@ Slur::get_attachment (Grob *me, Direction dir, } else if (str == "alongside-stem") { - o = Offset (0, Stem::chord_start_f (stem)); + o = Offset (0, Stem::chord_start_y (stem)); /* Default position is on stem X, on outer side of head Y */ @@ -338,7 +352,7 @@ Slur::get_attachment (Grob *me, Direction dir, */ Real stem_thickness = gh_scm2double (stem->get_grob_property ("thickness")) - * stem->paper_l ()->get_var ("stafflinethickness"); + * stem->get_paper ()->get_var ("linethickness"); o += Offset (0.5 * x_extent * (1 + Stem::get_direction (stem)) - ((dir + 1)/2) * stem_thickness @@ -386,7 +400,7 @@ Slur::get_attachment (Grob *me, Direction dir, - me->relative_coordinate (common[Y_AXIS], Y_AXIS); } - Offset off = ly_scm2offset (index_cell (me->get_grob_property + Offset off = ly_scm2offset (index_get_cell (me->get_grob_property ("attachment-offset"), dir)) * staff_space; @@ -401,19 +415,19 @@ Slur::encompass_offset (Grob*me, Grob **common) { Offset o; - Grob* stem_l = unsmob_grob (col->get_grob_property ("stem")); + Grob* stem = unsmob_grob (col->get_grob_property ("stem")); Direction dir = Directional_element_interface::get (me); - if (!stem_l) + if (!stem) { me->warning (_ ("Slur over rest?")); o[X_AXIS] = col->relative_coordinate (common[X_AXIS], X_AXIS); o[Y_AXIS] = col->relative_coordinate (common[Y_AXIS], Y_AXIS); return o; } - Direction stem_dir = Directional_element_interface::get (stem_l); - o[X_AXIS] = stem_l->relative_coordinate (0, X_AXIS); + Direction stem_dir = Directional_element_interface::get (stem); + o[X_AXIS] = stem->relative_coordinate (0, X_AXIS); /* Simply set x to middle of notehead @@ -426,9 +440,9 @@ Slur::encompass_offset (Grob*me, o[X_AXIS] -= 0.5 * stem_dir * x_extent; if ((stem_dir == dir) - && !stem_l->extent (stem_l, Y_AXIS).empty_b ()) + && !stem->extent (stem, Y_AXIS).empty_b ()) { - o[Y_AXIS] = stem_l->extent (common[Y_AXIS], Y_AXIS)[dir]; + o[Y_AXIS] = stem->extent (common[Y_AXIS], Y_AXIS)[dir]; } else { @@ -444,73 +458,64 @@ Slur::encompass_offset (Grob*me, } Array -Slur::get_encompass_offset_arr (Grob *me) +Slur::get_encompass_offsets (Grob *me) { Spanner*sp = dynamic_cast (me); SCM eltlist = me->get_grob_property ("note-columns"); - Grob *common[] = {me->common_refpoint (eltlist, X_AXIS), - me->common_refpoint (eltlist, Y_AXIS)}; + Grob *common[] = {common_refpoint_of_list (eltlist, me, X_AXIS), + common_refpoint_of_list (eltlist, me, Y_AXIS)}; common[X_AXIS] = common[X_AXIS]->common_refpoint (sp->get_bound (RIGHT), X_AXIS); common[X_AXIS] = common[X_AXIS]->common_refpoint (sp->get_bound (LEFT), X_AXIS); - Link_array encompass_arr; - while (gh_pair_p (eltlist)) - { - encompass_arr.push (unsmob_grob (ly_car (eltlist))); - eltlist =ly_cdr (eltlist); - } - encompass_arr.reverse (); - - - Array offset_arr; + Link_array encompasses = ly_scm2grobs (eltlist); + Array offsets; Offset origin (me->relative_coordinate (common[X_AXIS], X_AXIS), me->relative_coordinate (common[Y_AXIS], Y_AXIS)); int first = 1; - int last = encompass_arr.size () - 2; + int last = encompasses.size () - 2; - offset_arr.push (get_attachment (me, LEFT, common)); + offsets.push (get_attachment (me, LEFT, common)); /* left is broken edge */ - - if (encompass_arr[0] != sp->get_bound (LEFT)) + if (encompasses[0] != sp->get_bound (LEFT)) { first--; // ? - offset_arr[0][Y_AXIS] -= - encompass_arr[0]->relative_coordinate (common[Y_AXIS], Y_AXIS) + offsets[0][Y_AXIS] -= + encompasses[0]->relative_coordinate (common[Y_AXIS], Y_AXIS) - me->relative_coordinate (common[Y_AXIS], Y_AXIS); } /* right is broken edge */ - if (encompass_arr.top () != sp->get_bound (RIGHT)) + if (encompasses.top () != sp->get_bound (RIGHT)) { last++; } for (int i = first; i <= last; i++) { - Offset o (encompass_offset (me, encompass_arr[i], common)); - offset_arr.push (o - origin); + Offset o (encompass_offset (me, encompasses[i], common)); + offsets.push (o - origin); } - offset_arr.push (Offset (sp->spanner_length (), 0) + get_attachment (me, RIGHT,common)); + offsets.push (Offset (sp->spanner_length (), 0) + get_attachment (me, RIGHT,common)); - if (encompass_arr[0] != sp->get_bound (LEFT)) + if (encompasses[0] != sp->get_bound (LEFT)) { - offset_arr.top ()[Y_AXIS] -= encompass_arr.top ()->relative_coordinate (common[Y_AXIS], Y_AXIS) + offsets.top ()[Y_AXIS] -= encompasses.top ()->relative_coordinate (common[Y_AXIS], Y_AXIS) - me->relative_coordinate (common[Y_AXIS], Y_AXIS); } - return offset_arr; + return offsets; } @@ -545,7 +550,7 @@ Slur::brew_molecule (SCM smob) return SCM_EOL; } - Real thick = me->paper_l ()->get_var ("stafflinethickness") * + Real thick = me->get_paper ()->get_var ("linethickness") * gh_scm2double (me->get_grob_property ("thickness")); Bezier one = get_curve (me); @@ -569,16 +574,17 @@ Slur::set_control_points (Grob*me) Real staff_space = Staff_symbol_referencer::staff_space ((Grob*)me); SCM details = me->get_grob_property ("details"); - SCM h_inf_scm = scm_assq (ly_symbol2scm ("height-limit"), details); - SCM r_0_scm = scm_assq (ly_symbol2scm ("ratio"), details); + SCM h_inf_scm = me->get_grob_property ("height-limit"); + SCM r_0_scm = me->get_grob_property ("ratio"); - Real r_0 = gh_scm2double (ly_cdr (r_0_scm)); - Real h_inf = staff_space * gh_scm2double (ly_cdr (h_inf_scm)); + Real r_0 = gh_scm2double (r_0_scm); + Real h_inf = staff_space * gh_scm2double (h_inf_scm); - Slur_bezier_bow bb (get_encompass_offset_arr (me), + Slur_bezier_bow bb (get_encompass_offsets (me), Directional_element_interface::get (me), h_inf, r_0); + if (bb.fit_factor () > 1.0) { Real length = bb.curve_.control_[3][X_AXIS]; @@ -601,7 +607,7 @@ Slur::set_control_points (Grob*me) Real beautiful = length * default_height * sb; - Real area = bb.enclosed_area_f (); + Real area = bb.get_enclosed_area (); /* Slurs that fit beautifully are not ugly @@ -643,8 +649,8 @@ Slur::get_curve (Grob*me) if (!Directional_element_interface::get (me) - || ! gh_symbol_p (index_cell (attach, LEFT)) - || ! gh_symbol_p (index_cell (attach, RIGHT))) + || ! gh_symbol_p (index_get_cell (attach, LEFT)) + || ! gh_symbol_p (index_get_cell (attach, RIGHT))) set_extremities (me); if (!gh_pair_p (me->get_grob_property ("control-points"))) @@ -660,7 +666,7 @@ Slur::get_curve (Grob*me) i++; } - Array enc (get_encompass_offset_arr (me)); + Array enc (get_encompass_offsets (me)); Direction dir = Directional_element_interface::get (me); Real x1 = enc[0][X_AXIS]; @@ -681,14 +687,9 @@ Slur::get_curve (Grob*me) } -bool -Slur::has_interface (Grob*me) -{ - return me->has_interface (ly_symbol2scm ("slur-interface")); -} ADD_INTERFACE (Slur,"slur-interface", "A slur", - "slope-limit de-uglify-parameters details attachment direction attachment-offset beautiful y-free control-points extremity-rules extremity-offset-alist thickness dashed"); + "attachment attachment-offset beautiful control-points dashed details de-uglify-parameters direction extremity-rules extremity-offset-alist height-limit ratio slope-limit thickness y-free");