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);
}
SCM up = me->get_grob_property ("de-uglify-parameters");
Real c1 = gh_scm2double (ly_car (up));
- Real c2 = gh_scm2double (gh_cadr (up));
- Real c3 = gh_scm2double (gh_caddr (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 ++)
}
}
-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 = 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;
}
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 ? ly_car (s) : ly_cdr (s);
Spanner*sp = dynamic_cast<Spanner*> (me);
String str = ly_symbol2string (a);
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)))
{
/*
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 *
- x_extent * (1 + Stem::get_direction (stem)),
+ x_extent * (1 + Stem::get_direction (stem))
+ - ((dir + 1)/2) * stem_thickness
+ + ((1 - slurdir)/2) * stem_thickness,
0);
}
}
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_list_n (a,
gh_int2scm (stemdir * dir),
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;
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")))