X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fslur.cc;h=ad1d6097c0e8cf7008a2e46587dd115f99a0096a;hb=a48fe82a448339d0acb1a2c63a92e946b5c018b3;hp=8a05cc744e40e3ef2b0207c07209003da2311c22;hpb=61533ebc43e5b5b99702ff6a062ed4a1b9a5e2c0;p=lilypond.git diff --git a/lily/slur.cc b/lily/slur.cc index 8a05cc744e..ad1d6097c0 100644 --- a/lily/slur.cc +++ b/lily/slur.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2002 Han-Wen Nienhuys + (c) 1996--2004 Han-Wen Nienhuys Jan Nieuwenhuizen */ @@ -29,8 +29,8 @@ #include "note-column.hh" #include "stem.hh" #include "paper-column.hh" -#include "molecule.hh" -#include "debug.hh" +#include "stencil.hh" +#include "warn.hh" #include "slur-bezier-bow.hh" #include "main.hh" #include "group-interface.hh" @@ -49,9 +49,6 @@ Slur::set_interface (Grob*me) void Slur::add_column (Grob*me, Grob*n) { - if (!gh_pair_p (n->get_grob_property ("note-heads"))) - me->warning (_ ("Putting slur over rest.")); - Pointer_group_interface::add_grob (me, ly_symbol2scm ("note-columns"), n); me->add_dependency (n); @@ -96,13 +93,13 @@ Slur::de_uglyfy (Grob*me, Slur_bezier_bow* bb, Real default_height) 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; @@ -123,7 +120,8 @@ Slur::after_line_breaking (SCM smob) return SCM_UNSPECIFIED; } set_extremities (me); - set_control_points (me); + if (!gh_pair_p (me->get_grob_property ("control-points"))) + set_control_points (me); return SCM_UNSPECIFIED; } @@ -131,14 +129,13 @@ 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 (); @@ -159,11 +156,11 @@ 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); + o[d][Y_AXIS] *= get_grob_direction (me); me->set_grob_property ("attachment-offset", gh_cons (ly_offset2scm (o[LEFT]), @@ -179,8 +176,8 @@ Slur::check_slope (Grob *me) SCM Slur::set_extremities (Grob *me) { - if (!Directional_element_interface::get (me)) - Directional_element_interface::set (me, get_default_dir (me)); + if (!get_grob_direction (me)) + set_grob_direction (me, get_default_dir (me)); SCM att = me->get_grob_property ("attachment"); /* @@ -196,20 +193,16 @@ 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)) - { - SCM r = gh_call2 (ly_caar (s), me->self_scm (), - gh_int2scm ((int)dir)); - if (r != SCM_BOOL_F) - { - index_set_cell (att, dir, - ly_cdar (s)); - break; - } - } + SCM p = me->get_grob_property ("extremity-function"); + SCM res = ly_symbol2scm ("head"); + + if (gh_procedure_p (p)) + res = gh_call2 (p, me->self_scm (), gh_int2scm (dir)); + + if (gh_symbol_p (res)) + index_set_cell (att, dir, res); } } while (flip (&dir) != LEFT); @@ -221,14 +214,21 @@ Slur::set_extremities (Grob *me) Real -Slur::get_first_notecolumn_y (Grob *me, Direction dir) +Slur::get_boundary_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, @@ -255,27 +255,19 @@ 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; - dir == LEFT ? i++ : i--) - { - if (mother->broken_into_l_arr_[i - dir] == me) - { - Grob *neighbour = mother->broken_into_l_arr_[i]; - if (dir == RIGHT) - neighbour->set_grob_property ("direction", - me->get_grob_property ("direction")); - Real neighbour_y = get_first_notecolumn_y (neighbour, dir); - Real y = get_first_notecolumn_y (me, -dir); - int neighbour_cols = scm_ilength (neighbour->get_grob_property ("note-columns")); - int cols = scm_ilength (me->get_grob_property ("note-columns")); - o = Offset (0, (y*neighbour_cols + neighbour_y*cols) / - (cols + neighbour_cols)); - break; - } - } + int k = broken_spanner_index (dynamic_cast (me)); + Grob *neighbour = mother->broken_intos_[k + dir]; + if (dir == RIGHT) + neighbour->set_grob_property ("direction", + me->get_grob_property ("direction")); + Real neighbour_y = get_boundary_notecolumn_y (neighbour, dir); + Real y = get_boundary_notecolumn_y (me, -dir); + int neighbour_cols = scm_ilength (neighbour->get_grob_property ("note-columns")); + int cols = scm_ilength (me->get_grob_property ("note-columns")); + o = Offset (0, (y*neighbour_cols + neighbour_y*cols) / + (cols + neighbour_cols)); } return o; } @@ -284,48 +276,57 @@ Slur::broken_trend_offset (Grob *me, Direction dir) COMMON is size-2 array with common refpoints. UGH: this routine delivers offsets which are *not* relative to COMMON. + +UGH, we should take COMMON-Y as argument. */ 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_pair_p (s) || !gh_symbol_p (index_get_cell (s, dir))) { s = set_extremities (me); } - SCM a = dir == LEFT ? ly_car (s) : ly_cdr (s); + SCM a = (dir == LEFT) ? ly_car (s) : ly_cdr (s); Spanner*sp = dynamic_cast (me); String str = ly_symbol2string (a); + Real staff_space = Staff_symbol_referencer::staff_space ((Grob*)me); Real hs = staff_space / 2.0; Offset o; - int slurdir = gh_scm2int (me->get_grob_property ("direction")); + Direction slurdir = to_dir (me->get_grob_property ("direction")); Grob *stem = 0; if (Note_column::has_interface (sp->get_bound (dir))) { Grob * n =sp->get_bound (dir); - if ((stem = Note_column::stem_l (n))) + stem = Note_column::get_stem (n); + if (stem) { Real x_extent; - if (Grob *head = Note_column::first_head (n)) + Grob *head = Note_column::first_head (n); + if (head) x_extent = head->extent (head, X_AXIS).length (); else x_extent = n->extent (n, X_AXIS).length (); - if (str == "head") + if (!head) + { + o = Offset (0, n->extent (n, Y_AXIS)[slurdir]); + } + else if (str == "head") { o = Offset (0, Stem::head_positions (stem) - [Directional_element_interface::get (me)] * hs); + [slurdir] * hs); /* Default position is centered in X, on outer side of head Y */ o += Offset (0.5 * x_extent, 0.5 * staff_space - * Directional_element_interface::get (me)); + * slurdir); } else if (str == "alongside-stem") { @@ -335,7 +336,7 @@ Slur::get_attachment (Grob *me, Direction dir, */ o += Offset (x_extent * (1 + Stem::get_direction (stem)), 0.5 * staff_space - * Directional_element_interface::get (me)); + * slurdir); } else if (str == "stem") { @@ -343,9 +344,7 @@ Slur::get_attachment (Grob *me, Direction dir, /* Default position is on stem X, at stem end Y */ - Real stem_thickness = - gh_scm2double (stem->get_grob_property ("thickness")) - * stem->paper_l ()->get_var ("linethickness"); + Real stem_thickness = Stem::thickness (stem); o += Offset (0.5 * x_extent * (1 + Stem::get_direction (stem)) - ((dir + 1)/2) * stem_thickness @@ -379,7 +378,7 @@ Slur::get_attachment (Grob *me, Direction dir, { Offset off = ly_scm2offset (ly_cdr (l)) * staff_space; off[X_AXIS] *= dir; - off[Y_AXIS] *= Directional_element_interface::get (me); + off[Y_AXIS] *= slurdir; o += off; } @@ -393,11 +392,11 @@ 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; - off[Y_AXIS] *= Directional_element_interface::get (me); + off[Y_AXIS] *= slurdir; o += off; return o; } @@ -408,19 +407,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); + Direction dir = get_grob_direction (me); - if (!stem_l) + if (!stem) { - me->warning (_ ("Slur over rest?")); + programming_error ("No stem for note column?"); 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 = get_grob_direction (stem); + o[X_AXIS] = stem->relative_coordinate (0, X_AXIS); /* Simply set x to middle of notehead @@ -433,9 +432,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).is_empty ()) { - o[Y_AXIS] = stem_l->extent (common[Y_AXIS], Y_AXIS)[dir]; + o[Y_AXIS] = stem->extent (common[Y_AXIS], Y_AXIS)[dir]; } else { @@ -445,13 +444,13 @@ Slur::encompass_offset (Grob*me, /* leave a gap: slur mustn't touch head/stem */ - o[Y_AXIS] += dir * gh_scm2double (me->get_grob_property ("y-free")) * + o[Y_AXIS] += dir * robust_scm2double (me->get_grob_property ("y-free"), 0) * 1.0; return o; } 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"); @@ -462,53 +461,53 @@ Slur::get_encompass_offset_arr (Grob *me) 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 = list_to_grob_array (eltlist); - 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; } @@ -525,16 +524,19 @@ Slur::height (SCM smob, SCM ax) Grob * me = unsmob_grob (smob); assert (a == Y_AXIS); - SCM mol = me->get_uncached_molecule (); - return ly_interval2scm (unsmob_molecule (mol)->extent (a)); + SCM mol = me->get_uncached_stencil (); + Interval ext; + if (Stencil * m = unsmob_stencil (mol)) + ext = m->extent (a); + return ly_interval2scm (ext); } /* Ugh should have dash-length + dash-period */ -MAKE_SCHEME_CALLBACK (Slur, brew_molecule,1); +MAKE_SCHEME_CALLBACK (Slur, print,1); SCM -Slur::brew_molecule (SCM smob) +Slur::print (SCM smob) { Grob * me = unsmob_grob (smob); if (!scm_ilength (me->get_grob_property ("note-columns"))) @@ -543,20 +545,27 @@ Slur::brew_molecule (SCM smob) return SCM_EOL; } - Real thick = me->paper_l ()->get_var ("linethickness") * - gh_scm2double (me->get_grob_property ("thickness")); + Real base_thick = robust_scm2double (me->get_grob_property ("thickness"), 1); + Real thick = base_thick * Staff_symbol_referencer::line_thickness (me); + + Real ss = Staff_symbol_referencer::staff_space (me); Bezier one = get_curve (me); // get_curve may suicide if (!scm_ilength (me->get_grob_property ("note-columns"))) return SCM_EOL; - Molecule a; + Stencil a; + + /* + TODO: replace dashed with generic property. + */ SCM d = me->get_grob_property ("dashed"); if (gh_number_p (d)) - a = Lookup::dashed_slur (one, thick, thick * gh_scm2double (d)); + a = Lookup::dashed_slur (one, thick, thick * robust_scm2double (d, 0)); else - a = Lookup::slur (one, Directional_element_interface::get (me) * thick, thick); + a = Lookup::slur (one, get_grob_direction (me) * base_thick * ss / 10.0, + thick); return a.smobbed_copy (); } @@ -567,14 +576,14 @@ 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 = robust_scm2double (r_0_scm, 1); + Real h_inf = staff_space * gh_scm2double (h_inf_scm); - Slur_bezier_bow bb (get_encompass_offset_arr (me), - Directional_element_interface::get (me), + Slur_bezier_bow bb (get_encompass_offsets (me), + get_grob_direction (me), h_inf, r_0); @@ -600,7 +609,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 @@ -641,9 +650,9 @@ Slur::get_curve (Grob*me) attach = set_extremities(me); - if (!Directional_element_interface::get (me) - || ! gh_symbol_p (index_cell (attach, LEFT)) - || ! gh_symbol_p (index_cell (attach, RIGHT))) + if (!get_grob_direction (me) + || ! 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"))) @@ -659,8 +668,8 @@ Slur::get_curve (Grob*me) i++; } - Array enc (get_encompass_offset_arr (me)); - Direction dir = Directional_element_interface::get (me); + Array enc (get_encompass_offsets (me)); + Direction dir = get_grob_direction (me); Real x1 = enc[0][X_AXIS]; Real x2 = enc.top ()[X_AXIS]; @@ -684,5 +693,5 @@ Slur::get_curve (Grob*me) 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-function extremity-offset-alist height-limit note-columns ratio slope-limit thickness y-free");