source file of the GNU LilyPond music typesetter
- (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
/*
[TODO]
- * fix broken interstaff slurs
+ * should avoid stafflines with horizontal part.
* begin and end should be treated as a/acknowledge Scripts.
- * broken slur should have uniform trend
* smart changing of endings
* smart changing of (Y-?)offsets to avoid ugly beziers
- (along-side-stem)
+ (along-side-stem)
*/
#include "directional-element-interface.hh"
void
-Slur::set_interface (Score_element*me)
+Slur::set_interface (Grob*me)
{
- me->set_elt_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 (Score_element*me, Score_element*n)
+Slur::add_column (Grob*me, Grob*n)
{
- if (!gh_pair_p (n->get_elt_property ("note-heads")))
+ if (!gh_pair_p (n->get_grob_property ("note-heads")))
warning (_ ("Putting slur over rest. Ignoring."));
else
{
- Pointer_group_interface (me, "note-columns").add_element (n);
+ Pointer_group_interface::add_grob (me, ly_symbol2scm ("note-columns"), n);
me->add_dependency (n);
}
- add_bound_item (dynamic_cast<Spanner*> (me), dynamic_cast<Item*>(n));
+ add_bound_item (dynamic_cast<Spanner*> (me), dynamic_cast<Item*> (n));
}
void
-Slur::de_uglyfy (Score_element*me, Slur_bezier_bow* bb, Real default_height)
+Slur::de_uglyfy (Grob*me, Slur_bezier_bow* bb, Real default_height)
{
Real length = bb->curve_.control_[3][X_AXIS] ;
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_elt_property ("de-uglify-parameters");
+ 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)
{
}
Direction
-Slur::get_default_dir (Score_element*me)
+Slur::get_default_dir (Grob*me)
{
- Link_array<Score_element> encompass_arr =
- Pointer_group_interface__extract_elements (me, (Score_element*)0, "note-columns");
+ Link_array<Grob> encompass_arr =
+ Pointer_group_interface__extract_grobs (me, (Grob*)0, "note-columns");
Direction d = DOWN;
for (int i=0; i < encompass_arr.size (); i ++)
SCM
Slur::after_line_breaking (SCM smob)
{
- Score_element *me = unsmob_element (smob);
- if (!scm_ilength (me->get_elt_property ("note-columns")))
+ Grob *me = unsmob_grob (smob);
+ if (!scm_ilength (me->get_grob_property ("note-columns")))
{
me->suicide ();
return SCM_UNSPECIFIED;
return SCM_UNSPECIFIED;
}
+
void
-Slur::set_extremities (Score_element*me)
+Slur::check_slope (Grob *me)
+{
+ /*
+ Avoid too steep slurs.
+ */
+ SCM s = me->get_grob_property ("slope-limit");
+ if (gh_number_p (s))
+ {
+ Array<Offset> encompass = get_encompass_offset_arr (me);
+ Drul_array<Offset> attachment;
+ attachment[LEFT] = encompass[0];
+ attachment[RIGHT] = encompass.top ();
+
+ Real dx = attachment[RIGHT][X_AXIS] - attachment[LEFT][X_AXIS];
+ Real dy = attachment[RIGHT][Y_AXIS] - attachment[LEFT][Y_AXIS];
+ if (!dx)
+ return;
+
+ Real slope = slope = abs (dy / dx);
+
+ Real limit = gh_scm2double (s);
+
+ if (slope > limit)
+ {
+ 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)));
+ SCM a = me->get_grob_property ("attachment-offset");
+ Drul_array<Offset> 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] *= Directional_element_interface::get (me);
+
+ me->set_grob_property ("attachment-offset",
+ gh_cons (ly_offset2scm (o[LEFT]),
+ ly_offset2scm (o[RIGHT])));
+ }
+ }
+}
+
+void
+Slur::set_extremities (Grob *me)
{
if (!Directional_element_interface::get (me))
- Directional_element_interface ::set (me,get_default_dir (me));
+ Directional_element_interface::set (me, get_default_dir (me));
Direction dir = LEFT;
do
{
- if (!gh_symbol_p (index_cell (me->get_elt_property ("attachment"), dir)))
+ 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);
+ }
+
+ if (!gh_symbol_p (index_cell (att, dir)))
{
- for (SCM s = me->get_elt_property ("extremity-rules");
- s != SCM_EOL; s = gh_cdr (s))
+ for (SCM s = me->get_grob_property ("extremity-rules");
+ 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_elt_property ("attachment"), dir,
- gh_cdar (s));
+ index_set_cell (att, dir,
+ ly_cdar (s));
break;
}
}
}
}
while (flip (&dir) != LEFT);
+
+ check_slope (me);
}
+
Real
-Slur::get_first_notecolumn_y (Score_element *me, Direction dir)
+Slur::get_first_notecolumn_y (Grob *me, Direction dir)
{
- Score_element *col = dir == LEFT
- ? unsmob_element (gh_car (scm_reverse (me->get_elt_property
- ("note-columns"))))
- : unsmob_element
- (gh_car (me->get_elt_property ("note-columns")));
+ 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")));
- Score_element *common[] =
+ Grob *common[] =
{
0,
me->common_refpoint (col, Y_AXIS)
}
Offset
-Slur::broken_trend_offset (Score_element *me, Direction dir)
+Slur::broken_trend_offset (Grob *me, Direction dir)
{
/*
A broken slur should maintain the same vertical trend
{
if (mother->broken_into_l_arr_[i - dir] == me)
{
- Score_element *neighbour = mother->broken_into_l_arr_[i];
+ Grob *neighbour = mother->broken_into_l_arr_[i];
if (dir == RIGHT)
- neighbour->set_elt_property ("direction",
- me->get_elt_property ("direction"));
+ 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);
- o = Offset (0, (y + neighbour_y) / 2);
+ 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;
}
}
}
Offset
-Slur::get_attachment (Score_element*me,Direction dir,
- Score_element **common)
+Slur::get_attachment (Grob *me, Direction dir,
+ Grob **common)
{
- SCM s = me->get_elt_property ("attachment");
+ SCM s = me->get_grob_property ("attachment");
if (!gh_symbol_p (index_cell (s, dir)))
{
set_extremities (me);
- s = me->get_elt_property ("attachment");
+ s = me->get_grob_property ("attachment");
}
- SCM a = dir == LEFT ? gh_car (s) : gh_cdr (s);
- Spanner*sp = dynamic_cast<Spanner*>(me);
+ SCM a = dir == LEFT ? ly_car (s) : ly_cdr (s);
+ Spanner*sp = dynamic_cast<Spanner*> (me);
String str = ly_symbol2string (a);
- Real ss = Staff_symbol_referencer::staff_space ((Score_element*)me);
- Real hs = ss / 2.0;
+ Real staff_space = Staff_symbol_referencer::staff_space ((Grob*)me);
+ Real hs = staff_space / 2.0;
Offset o;
- Score_element *stem = 0;
+ Grob *stem = 0;
if (Note_column::has_interface (sp->get_bound (dir)))
{
- Score_element * n =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")
{
/*
Default position is centered in X, on outer side of head Y
*/
- o += Offset (0.5 * n->extent (X_AXIS).length (),
- 0.5 * ss * Directional_element_interface::get (me));
+ o += Offset (0.5 * x_extent,
+ 0.5 * staff_space
+ * Directional_element_interface::get (me));
}
else if (str == "alongside-stem")
{
/*
Default position is on stem X, on outer side of head Y
*/
- o += Offset (n->extent (X_AXIS).length ()
- * (1 + Stem::get_direction (stem)),
- 0.5 * ss * Directional_element_interface::get (me));
+ o += Offset (x_extent * (1 + Stem::get_direction (stem)),
+ 0.5 * staff_space
+ * Directional_element_interface::get (me));
}
else if (str == "stem")
{
Default position is on stem X, at stem end Y
*/
o += Offset (0.5 *
- (n->extent (X_AXIS).length ()
- - stem->extent (X_AXIS).length ())
- * (1 + Stem::get_direction (stem)),
- 0);
+ x_extent * (1 + Stem::get_direction (stem)),
+ 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_elt_property ("extremity-offset-alist");
-int stemdir = stem ? Stem::get_direction (stem) : 1;
- int slurdir = gh_scm2int (me->get_elt_property ("direction"));
+ 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"));
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)) * ss * dir;
+ Offset off = ly_scm2offset (ly_cdr (l)) * staff_space;
+ off[X_AXIS] *= dir;
+ off[Y_AXIS] *= Directional_element_interface::get (me);
+ o += off;
}
/*
- me->relative_coordinate (common[Y_AXIS], Y_AXIS);
}
+ 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;
}
Offset
-Slur::encompass_offset (Score_element*me,
- Score_element* col,
- Score_element **common)
+Slur::encompass_offset (Grob*me,
+ Grob* col,
+ Grob **common)
{
Offset o;
- Score_element* stem_l = unsmob_element (col->get_elt_property ("stem"));
+ Grob* stem_l = unsmob_grob (col->get_grob_property ("stem"));
Direction dir = Directional_element_interface::get (me);
/*
Simply set x to middle of notehead
*/
-
- o[X_AXIS] -= 0.5 * stem_dir * col->extent (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 (Y_AXIS).empty_b ())
+ && !stem_l->extent (stem_l, Y_AXIS).empty_b ())
{
- o[Y_AXIS] = stem_l->relative_coordinate (common[Y_AXIS], Y_AXIS); // iuhg
- o[Y_AXIS] += stem_l->extent (Y_AXIS)[dir];
+ o[Y_AXIS] = stem_l->extent (common[Y_AXIS], Y_AXIS)[dir];
}
else
{
- o[Y_AXIS] = col->relative_coordinate (common[Y_AXIS], Y_AXIS); // ugh
- o[Y_AXIS] += col->extent (Y_AXIS)[dir];
+ o[Y_AXIS] = col->extent (common[Y_AXIS], Y_AXIS)[dir];
}
/*
leave a gap: slur mustn't touch head/stem
*/
- o[Y_AXIS] += dir * gh_scm2double (me->get_elt_property ("y-free")) *
- me->paper_l ()->get_var ("staffspace");
+ o[Y_AXIS] += dir * gh_scm2double (me->get_grob_property ("y-free")) *
+ 1.0;
return o;
}
Array<Offset>
-Slur::get_encompass_offset_arr (Score_element*me)
+Slur::get_encompass_offset_arr (Grob *me)
{
- Spanner*sp = dynamic_cast<Spanner*>(me);
- SCM eltlist = me->get_elt_property ("note-columns");
- Score_element *common[] = {me->common_refpoint (eltlist,X_AXIS),
- me->common_refpoint (eltlist,Y_AXIS)};
+ Spanner*sp = dynamic_cast<Spanner*> (me);
+ SCM eltlist = me->get_grob_property ("note-columns");
+ Grob *common[] = {me->common_refpoint (eltlist, X_AXIS),
+ me->common_refpoint (eltlist, 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<Score_element> encompass_arr;
+ Link_array<Grob> 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 ();
}
-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)
{
- Score_element*me = unsmob_element (smob);
-
- Rod r;
- Spanner*sp = dynamic_cast<Spanner*>(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_elt_property ("minimum-length"))
- * me->paper_l ()->get_var ("staffspace");
+ Axis a = (Axis)gh_scm2int (ax);
+ Grob * me = unsmob_grob (smob);
+ assert (a == Y_AXIS);
- 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
*/
SCM
Slur::brew_molecule (SCM smob)
{
- Score_element * me = unsmob_element (smob);
- if (!scm_ilength (me->get_elt_property ("note-columns")))
+ Grob * me = unsmob_grob (smob);
+ if (!scm_ilength (me->get_grob_property ("note-columns")))
{
me->suicide ();
return SCM_EOL;
}
Real thick = me->paper_l ()->get_var ("stafflinethickness") *
- gh_scm2double (me->get_elt_property ("thickness"));
+ gh_scm2double (me->get_grob_property ("thickness"));
Bezier one = get_curve (me);
// get_curve may suicide
- if (!scm_ilength (me->get_elt_property ("note-columns")))
+ if (!scm_ilength (me->get_grob_property ("note-columns")))
return SCM_EOL;
Molecule a;
- SCM d = me->get_elt_property ("dashed");
+ SCM d = me->get_grob_property ("dashed");
if (gh_number_p (d))
- a = me->lookup_l ()->dashed_slur (one, thick, thick * gh_scm2double (d));
+ a = Lookup::dashed_slur (one, thick, thick * gh_scm2double (d));
else
- a = me->lookup_l ()->slur (one, Directional_element_interface::get (me) * thick, thick);
+ a = Lookup::slur (one, Directional_element_interface::get (me) * thick, thick);
- return a.create_scheme();
+ return a.smobbed_copy ();
}
void
-Slur::set_control_points (Score_element*me)
+Slur::set_control_points (Grob*me)
{
- Real staff_space = Staff_symbol_referencer::staff_space ((Score_element*)me);
+ Real staff_space = Staff_symbol_referencer::staff_space ((Grob*)me);
- SCM details = me->get_elt_property ("details");
+ 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);
- 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),
Real length = bb.curve_.control_[3][X_AXIS];
Real default_height = slur_height (length, h_inf, r_0);
- SCM ssb = scm_assq (ly_symbol2scm ("beautiful"), details);
- Real sb =gh_scm2double (gh_cdr (ssb));
+ SCM ssb = me->get_grob_property ("beautiful");
+ Real sb = 0;
+ if (gh_number_p (ssb))
+ sb = gh_scm2double (ssb);
- bb.minimise_enclosed_area (me->paper_l(), sb);
+ 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;
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?
}
}
- me->set_elt_property ("control-points", controls);
+ me->set_grob_property ("control-points", controls);
}
Bezier
-Slur::get_curve (Score_element*me)
+Slur::get_curve (Grob*me)
{
Bezier b;
int i = 0;
if (!Directional_element_interface::get (me)
- || ! gh_symbol_p (index_cell (me->get_elt_property ("attachment"), LEFT))
- || ! gh_symbol_p (index_cell (me->get_elt_property ("attachment"), RIGHT)))
+ || ! gh_symbol_p (index_cell (me->get_grob_property ("attachment"), LEFT))
+ || ! gh_symbol_p (index_cell (me->get_grob_property ("attachment"), RIGHT)))
set_extremities (me);
- if (!gh_pair_p (me->get_elt_property ("control-points")))
+ if (!gh_pair_p (me->get_grob_property ("control-points")))
set_control_points (me);
// set_control_points may suicide
- if (!scm_ilength (me->get_elt_property ("note-columns")))
+ if (!scm_ilength (me->get_grob_property ("note-columns")))
return b;
- for (SCM s= me->get_elt_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++;
}
if (x > x1 && x <x2)
{
Real y = b.get_other_coordinate (X_AXIS, x);
- off = off >? dir * (enc[i][Y_AXIS] - y);
+ off = off >? dir * (enc[i][Y_AXIS] - y);
}
}
b.translate (Offset (0, dir * off));
bool
-Slur::has_interface (Score_element*me)
+Slur::has_interface (Grob*me)
{
return me->has_interface (ly_symbol2scm ("slur-interface"));
}
projects / lilypond.git / blobdiff