source file of the GNU LilyPond music typesetter
- (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "context.hh"
#include "note-column.hh"
#include "spanner.hh"
#include "tie.hh"
+#include "warn.hh"
/*
It is possible that a slur starts and ends on the same note. At
Phrasing_slur_engraver::acknowledge_extra_object (Grob_info info)
{
Grob *e = info.grob ();
- SCM inside = e->get_property ("inside-slur");
+ SCM avoid = e->get_property ("avoid-slur");
if (Tie::has_interface (e)
- || to_boolean (inside))
+ || avoid == ly_symbol2scm ("inside"))
{
for (int i = slurs_.size (); i--;)
Slur::add_extra_encompass (slurs_[i], e);
for (int i = end_slurs_.size (); i--;)
Slur::add_extra_encompass (end_slurs_[i], e);
}
- else if (inside == SCM_BOOL_F
- && e->name () != "DynamicText")
+ else if (avoid == ly_symbol2scm ("outside")
+ || avoid == ly_symbol2scm ("around"))
{
Grob *slur = slurs_.size () ? slurs_[0] : 0;
slur = (end_slurs_.size () && !slur)
if (slur)
{
- e->add_offset_callback (Slur::outside_slur_callback_proc, Y_AXIS);
+ chain_offset_callback (e, Slur::outside_slur_callback_proc, Y_AXIS);
e->set_object ("slur", slur->self_scm ());
}
}