source file of the GNU LilyPond music typesetter
- (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1996--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
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);
}
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)
{
Slur::get_default_dir (Grob*me)
{
Link_array<Grob> 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 ++)
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])));
}
}
-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;
}
}
while (flip (&dir) != LEFT);
check_slope (me);
+
+ return att;
}
Slur::get_first_notecolumn_y (Grob *me, Direction dir)
{
Grob *col = dir == LEFT
- ? unsmob_grob (gh_car (scm_reverse (me->get_grob_property
+ ? unsmob_grob (ly_car (scm_reverse (me->get_grob_property
("note-columns"))))
: unsmob_grob
- (gh_car (me->get_grob_property ("note-columns")));
+ (ly_car (me->get_grob_property ("note-columns")));
Grob *common[] =
{
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);
+
+ SCM a = dir == LEFT ? ly_car (s) : ly_cdr (s);
Spanner*sp = dynamic_cast<Spanner*> (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")
{
/*
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));
}
/*
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));
}
/*
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);
}
}
}
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")
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"));
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;
}
/*
- 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;
}
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;
/*
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 ())
Link_array<Grob> encompass_arr;
while (gh_pair_p (eltlist))
{
- encompass_arr.push (unsmob_grob (gh_car (eltlist)));
- eltlist =gh_cdr (eltlist);
+ encompass_arr.push (unsmob_grob (ly_car (eltlist)));
+ eltlist =ly_cdr (eltlist);
}
encompass_arr.reverse ();
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),
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;
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")))
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++;
}