X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur.cc;h=427cd0799acaae8552d332d0478fac6d90a73228;hb=2fc177dc2401903f604f4520c7b59e1544046ed5;hp=257416602d2508bc3d7447ac712a3cdd13adec36;hpb=df4a7c4a55148e065d878dcc2f7e09ac27ea9c32;p=lilypond.git diff --git a/lily/slur.cc b/lily/slur.cc index 257416602d..427cd0799a 100644 --- a/lily/slur.cc +++ b/lily/slur.cc @@ -3,18 +3,17 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2002 Han-Wen Nienhuys Jan Nieuwenhuizen */ /* [TODO] - * fix broken interstaff slurs * should avoid stafflines with horizontal part. * begin and end should be treated as a/acknowledge Scripts. * smart changing of endings * smart changing of (Y-?)offsets to avoid ugly beziers - (along-side-stem) + (along-side-stem) */ #include "directional-element-interface.hh" @@ -37,22 +36,23 @@ void Slur::set_interface (Grob*me) { - me->set_grob_property ("attachment", gh_cons (SCM_BOOL_F, SCM_BOOL_F)); - me->set_interface (ly_symbol2scm ("slur-interface")); + /* Copy to mutable list. */ + me->set_grob_property ("attachment", + ly_deep_copy (me->get_grob_property ("attachment"))); } void Slur::add_column (Grob*me, Grob*n) { if (!gh_pair_p (n->get_grob_property ("note-heads"))) - warning (_ ("Putting slur over rest. Ignoring.")); + me->warning (_ ("Putting slur over rest. Ignoring.")); else { - Pointer_group_interface::add_element (me, "note-columns",n); + Pointer_group_interface::add_grob (me, ly_symbol2scm ("note-columns"), n); me->add_dependency (n); } - add_bound_item (dynamic_cast (me), dynamic_cast(n)); + add_bound_item (dynamic_cast (me), dynamic_cast (n)); } void @@ -62,16 +62,16 @@ Slur::de_uglyfy (Grob*me, Slur_bezier_bow* bb, Real default_height) Real ff = bb->fit_factor (); for (int i = 1; i < 3; i++) { - Real ind = abs (bb->curve_.control_[(i-1)*3][X_AXIS] + Real ind = abs (bb->curve_.control_[ (i-1)*3][X_AXIS] - bb->curve_.control_[i][X_AXIS]) / length; Real h = bb->curve_.control_[i][Y_AXIS] * ff / length; Real f = default_height / length; SCM up = me->get_grob_property ("de-uglify-parameters"); - Real c1 = gh_scm2double (gh_car (up)); - Real c2 = gh_scm2double (gh_cadr (up)); - Real c3 = gh_scm2double (gh_caddr (up)); + Real c1 = gh_scm2double (ly_car (up)); + Real c2 = gh_scm2double (ly_cadr (up)); + Real c3 = gh_scm2double (ly_caddr (up)); if (h > c1 * f) { @@ -92,7 +92,7 @@ Direction Slur::get_default_dir (Grob*me) { Link_array encompass_arr = - Pointer_group_interface__extract_elements (me, (Grob*)0, "note-columns"); + Pointer_group_interface__extract_grobs (me, (Grob*)0, "note-columns"); Direction d = DOWN; for (int i=0; i < encompass_arr.size (); i ++) @@ -111,7 +111,7 @@ MAKE_SCHEME_CALLBACK (Slur, after_line_breaking,1); SCM Slur::after_line_breaking (SCM smob) { - Grob *me = unsmob_element (smob); + Grob *me = unsmob_grob (smob); if (!scm_ilength (me->get_grob_property ("note-columns"))) { me->suicide (); @@ -150,13 +150,15 @@ Slur::check_slope (Grob *me) { Real staff_space = Staff_symbol_referencer::staff_space ((Grob*)me); Direction dir = (Direction)gh_scm2int (me->get_grob_property ("direction")); - Direction d = (Direction)(- dir * (sign (dy))); + 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[d][Y_AXIS] -= (limit - slope) * dx * dir / staff_space; - //o[d][Y_AXIS] = attachment[-d][Y_AXIS] + (dx * limit * dir / staff_space); + + o[d][Y_AXIS] *= Directional_element_interface::get (me); + me->set_grob_property ("attachment-offset", gh_cons (ly_offset2scm (o[LEFT]), ly_offset2scm (o[RIGHT]))); @@ -164,26 +166,40 @@ Slur::check_slope (Grob *me) } } -void +/* + Set 'attachment grob property, and return it. +*/ +SCM Slur::set_extremities (Grob *me) { if (!Directional_element_interface::get (me)) Directional_element_interface::set (me, get_default_dir (me)); + SCM att = me->get_grob_property ("attachment"); + /* + */ + if (!gh_pair_p (att)) + { + programming_error ("attachment is not a cons?!"); + att = gh_cons (SCM_EOL, SCM_EOL); + me->set_grob_property ("attachment", att); + } + Direction dir = LEFT; do { - if (!gh_symbol_p (index_cell (me->get_grob_property ("attachment"), dir))) + + if (!gh_symbol_p (index_cell (att, dir))) { for (SCM s = me->get_grob_property ("extremity-rules"); - s != SCM_EOL; s = gh_cdr (s)) + s != SCM_EOL; s = ly_cdr (s)) { - SCM r = gh_call2 (gh_caar (s), me->self_scm (), + SCM r = gh_call2 (ly_caar (s), me->self_scm (), gh_int2scm ((int)dir)); if (r != SCM_BOOL_F) { - index_set_cell (me->get_grob_property ("attachment"), dir, - gh_cdar (s)); + index_set_cell (att, dir, + ly_cdar (s)); break; } } @@ -192,6 +208,8 @@ Slur::set_extremities (Grob *me) while (flip (&dir) != LEFT); check_slope (me); + + return att; } @@ -199,10 +217,10 @@ Real Slur::get_first_notecolumn_y (Grob *me, Direction dir) { Grob *col = dir == LEFT - ? unsmob_element (gh_car (scm_reverse (me->get_grob_property - ("note-columns")))) - : unsmob_element - (gh_car (me->get_grob_property ("note-columns"))); + ? unsmob_grob (ly_car (scm_reverse (me->get_grob_property + ("note-columns")))) + : unsmob_grob + (ly_car (me->get_grob_property ("note-columns"))); Grob *common[] = { @@ -247,7 +265,7 @@ Slur::broken_trend_offset (Grob *me, Direction 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)); + (cols + neighbour_cols)); break; } } @@ -262,22 +280,29 @@ Slur::get_attachment (Grob *me, Direction dir, SCM s = me->get_grob_property ("attachment"); if (!gh_symbol_p (index_cell (s, dir))) { - set_extremities (me); - s = me->get_grob_property ("attachment"); + s = set_extremities (me); } - SCM a = dir == LEFT ? gh_car (s) : gh_cdr (s); - Spanner*sp = dynamic_cast(me); + + 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")); + 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))) { + Real x_extent; + if (Grob *head = Note_column::first_head (n)) + x_extent = head->extent (head, X_AXIS).length (); + else + x_extent = n->extent (n, X_AXIS).length (); if (str == "head") { @@ -286,7 +311,7 @@ Slur::get_attachment (Grob *me, Direction dir, /* Default position is centered in X, on outer side of head Y */ - o += Offset (0.5 * n->extent (n,X_AXIS).length (), + o += Offset (0.5 * x_extent, 0.5 * staff_space * Directional_element_interface::get (me)); } @@ -296,8 +321,7 @@ Slur::get_attachment (Grob *me, Direction dir, /* Default position is on stem X, on outer side of head Y */ - o += Offset (n->extent (n,X_AXIS).length () - * (1 + Stem::get_direction (stem)), + o += Offset (x_extent * (1 + Stem::get_direction (stem)), 0.5 * staff_space * Directional_element_interface::get (me)); } @@ -307,45 +331,44 @@ 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 ("stafflinethickness"); o += Offset (0.5 * - (n->extent (n,X_AXIS).length () - - stem->extent (stem,X_AXIS).length ()) - * (1 + Stem::get_direction (stem)), - 0); + x_extent * (1 + Stem::get_direction (stem)) + - ((dir + 1)/2) * stem_thickness + + ((1 - slurdir)/2) * stem_thickness, + 0); } } } - else if (str == "loose-end") + /* + If we're not a note_column, we can't be anything but a loose-end. + But if user has set (attachment . (stem . stem)), our string is + stem, not loose-end. + + Hmm, maybe after-line-breaking should set this to loose-end? */ + else // if (str == "loose-end") { - SCM other_a = dir == LEFT ? gh_cdr (s) : gh_car (s); + SCM other_a = dir == LEFT ? ly_cdr (s) : ly_car (s); if (ly_symbol2string (other_a) != "loose-end") - { -#if 0 - /* - The braindead way: horizontal - */ - o = Offset (0, get_attachment (me, -dir, common)[Y_AXIS]); -#else - o = broken_trend_offset (me, dir); -#endif - - - } - + o = broken_trend_offset (me, dir); } SCM alist = me->get_grob_property ("extremity-offset-alist"); -int stemdir = stem ? Stem::get_direction (stem) : 1; - int slurdir = gh_scm2int (me->get_grob_property ("direction")); + int stemdir = stem ? Stem::get_direction (stem) : 1; SCM l = scm_assoc - (scm_listify (a, - gh_int2scm (stemdir * dir), - gh_int2scm (slurdir * dir), + (scm_list_n (a, + gh_int2scm (stemdir * dir), + gh_int2scm (slurdir * dir), SCM_UNDEFINED), alist); if (l != SCM_BOOL_F) { - o += ly_scm2offset (gh_cdr (l)) * staff_space * dir; + Offset off = ly_scm2offset (ly_cdr (l)) * staff_space; + off[X_AXIS] *= dir; + off[Y_AXIS] *= Directional_element_interface::get (me); + o += off; } /* @@ -358,8 +381,12 @@ int stemdir = stem ? Stem::get_direction (stem) : 1; - me->relative_coordinate (common[Y_AXIS], Y_AXIS); } - o += ly_scm2offset (index_cell (me->get_grob_property ("attachment-offset"), - dir)) * staff_space; + Offset off = ly_scm2offset (index_cell (me->get_grob_property + ("attachment-offset"), + dir)) * staff_space; + + off[Y_AXIS] *= Directional_element_interface::get (me); + o += off; return o; } @@ -369,13 +396,13 @@ Slur::encompass_offset (Grob*me, Grob **common) { Offset o; - Grob* stem_l = unsmob_element (col->get_grob_property ("stem")); + Grob* stem_l = unsmob_grob (col->get_grob_property ("stem")); Direction dir = Directional_element_interface::get (me); if (!stem_l) { - warning (_ ("Slur over rest?")); + 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; @@ -386,8 +413,12 @@ Slur::encompass_offset (Grob*me, /* Simply set x to middle of notehead */ - - o[X_AXIS] -= 0.5 * stem_dir * col->extent (col,X_AXIS).length (); + Real x_extent; + if (Grob *head = Note_column::first_head (col)) + x_extent = head->extent (head, X_AXIS).length (); + else + x_extent = col->extent (col, X_AXIS).length (); + o[X_AXIS] -= 0.5 * stem_dir * x_extent; if ((stem_dir == dir) && !stem_l->extent (stem_l, Y_AXIS).empty_b ()) @@ -410,7 +441,7 @@ Slur::encompass_offset (Grob*me, Array Slur::get_encompass_offset_arr (Grob *me) { - Spanner*sp = dynamic_cast(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)}; @@ -422,8 +453,8 @@ Slur::get_encompass_offset_arr (Grob *me) Link_array encompass_arr; while (gh_pair_p (eltlist)) { - encompass_arr.push (unsmob_element (gh_car (eltlist))); - eltlist =gh_cdr (eltlist); + encompass_arr.push (unsmob_grob (ly_car (eltlist))); + eltlist =ly_cdr (eltlist); } encompass_arr.reverse (); @@ -478,25 +509,23 @@ Slur::get_encompass_offset_arr (Grob *me) } -MAKE_SCHEME_CALLBACK(Slur,set_spacing_rods,1); + + +/* + ugh ? + */ +MAKE_SCHEME_CALLBACK (Slur, height, 2); SCM -Slur::set_spacing_rods (SCM smob) +Slur::height (SCM smob, SCM ax) { - Grob*me = unsmob_element (smob); + Axis a = (Axis)gh_scm2int (ax); + Grob * me = unsmob_grob (smob); + assert (a == Y_AXIS); - Rod r; - Spanner*sp = dynamic_cast(me); - r.item_l_drul_[LEFT] = sp->get_bound (LEFT); - r.item_l_drul_[RIGHT] = sp->get_bound (RIGHT); - r.distance_f_ = - gh_scm2double (me->get_grob_property ("minimum-length")) - * 1.0; - - r.add_to_cols (); - return SCM_UNSPECIFIED; + SCM mol = me->get_uncached_molecule (); + return ly_interval2scm (unsmob_molecule (mol)->extent (a)); } - /* Ugh should have dash-length + dash-period */ @@ -504,7 +533,7 @@ MAKE_SCHEME_CALLBACK (Slur, brew_molecule,1); SCM Slur::brew_molecule (SCM smob) { - Grob * me = unsmob_element (smob); + Grob * me = unsmob_grob (smob); if (!scm_ilength (me->get_grob_property ("note-columns"))) { me->suicide (); @@ -526,7 +555,7 @@ Slur::brew_molecule (SCM smob) else a = Lookup::slur (one, Directional_element_interface::get (me) * thick, thick); - return a.smobbed_copy(); + return a.smobbed_copy (); } void @@ -538,8 +567,8 @@ Slur::set_control_points (Grob*me) SCM h_inf_scm = scm_assq (ly_symbol2scm ("height-limit"), details); SCM r_0_scm = scm_assq (ly_symbol2scm ("ratio"), details); - Real r_0 = gh_scm2double (gh_cdr (r_0_scm)); - Real h_inf = staff_space * gh_scm2double (gh_cdr (h_inf_scm)); + Real r_0 = gh_scm2double (ly_cdr (r_0_scm)); + Real h_inf = staff_space * gh_scm2double (ly_cdr (h_inf_scm)); Slur_bezier_bow bb (get_encompass_offset_arr (me), Directional_element_interface::get (me), @@ -555,11 +584,11 @@ Slur::set_control_points (Grob*me) if (gh_number_p (ssb)) sb = gh_scm2double (ssb); - bb.minimise_enclosed_area ( sb, details); + bb.minimise_enclosed_area (sb, details); SCM sbf = scm_assq (ly_symbol2scm ("force-blowfit"), details); Real bff = 1.0; - if (gh_pair_p (sbf) && gh_number_p (gh_cdr (sbf))) - bff = gh_scm2double (gh_cdr (sbf)); + if (gh_pair_p (sbf) && gh_number_p (ly_cdr (sbf))) + bff = gh_scm2double (ly_cdr (sbf)); bb.curve_.control_[1][Y_AXIS] *= bff; bb.curve_.control_[2][Y_AXIS] *= bff; @@ -582,7 +611,7 @@ Slur::set_control_points (Grob*me) SCM controls = SCM_EOL; for (int i= 4; i--;) { - controls = gh_cons ( ly_offset2scm (b.control_[i]), controls); + controls = gh_cons (ly_offset2scm (b.control_[i]), controls); /* BRRR WHURG. All these null control-points, where do they all come from? @@ -603,9 +632,14 @@ Slur::get_curve (Grob*me) Bezier b; int i = 0; + SCM attach = me->get_grob_property ("attachment"); + if (!gh_pair_p (attach)) + attach = set_extremities(me); + + if (!Directional_element_interface::get (me) - || ! gh_symbol_p (index_cell (me->get_grob_property ("attachment"), LEFT)) - || ! gh_symbol_p (index_cell (me->get_grob_property ("attachment"), RIGHT))) + || ! gh_symbol_p (index_cell (attach, LEFT)) + || ! gh_symbol_p (index_cell (attach, RIGHT))) set_extremities (me); if (!gh_pair_p (me->get_grob_property ("control-points"))) @@ -615,9 +649,9 @@ Slur::get_curve (Grob*me) if (!scm_ilength (me->get_grob_property ("note-columns"))) return b; - for (SCM s= me->get_grob_property ("control-points"); s != SCM_EOL; s = gh_cdr (s)) + for (SCM s= me->get_grob_property ("control-points"); s != SCM_EOL; s = ly_cdr (s)) { - b.control_[i] = ly_scm2offset (gh_car (s)); + b.control_[i] = ly_scm2offset (ly_car (s)); i++; } @@ -634,7 +668,7 @@ Slur::get_curve (Grob*me) if (x > x1 && x ? dir * (enc[i][Y_AXIS] - y); + off = off >? dir * (enc[i][Y_AXIS] - y); } } b.translate (Offset (0, dir * off));