/*
slur-engraver.cc -- implement Slur_engraver
- (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ source file of the GNU LilyPond music typesetter
+
+ (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "slur.hh"
#include "engraver.hh"
#include "spanner.hh"
#include "tie.hh"
+#include "warn.hh"
/*
It is possible that a slur starts and ends on the same note. At
least, it is for phrasing slurs: a note can be both beginning and
ending of a phrase.
*/
-
class Slur_engraver : public Engraver
{
Drul_array<Music *> events_;
protected:
virtual bool try_music (Music *);
- DECLARE_ACKNOWLEDGER (note_column);
DECLARE_ACKNOWLEDGER (accidental);
+ DECLARE_ACKNOWLEDGER (dynamic_line_spanner);
DECLARE_ACKNOWLEDGER (fingering);
+ DECLARE_ACKNOWLEDGER (note_column);
DECLARE_ACKNOWLEDGER (script);
- DECLARE_ACKNOWLEDGER (tie);
DECLARE_ACKNOWLEDGER (text_script);
+ DECLARE_ACKNOWLEDGER (tie);
+ DECLARE_ACKNOWLEDGER (tuplet_number);
void acknowledge_extra_object (Grob_info);
void stop_translation_timestep ();
virtual void finalize ();
void
Slur_engraver::acknowledge_extra_object (Grob_info info)
{
- Grob*e = info.grob ();
- SCM inside = e->get_property ("inside-slur");
+ if (slurs_.is_empty ()
+ && end_slurs_.is_empty ())
+ return ;
+
+ Grob *e = info.grob ();
+ 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)
+ 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 ());
}
}
+ else
+ e->warning ("Ignoring grob for slur. avoid-slur not set?");
}
void
acknowledge_extra_object (info);
}
+void
+Slur_engraver::acknowledge_dynamic_line_spanner (Grob_info info)
+{
+ acknowledge_extra_object (info);
+}
void
Slur_engraver::acknowledge_fingering (Grob_info info)
acknowledge_extra_object (info);
}
+void
+Slur_engraver::acknowledge_tuplet_number (Grob_info info)
+{
+ acknowledge_extra_object (info);
+}
+
+
void
Slur_engraver::acknowledge_script (Grob_info info)
{
void
Slur_engraver::acknowledge_text_script (Grob_info info)
{
+ // if (!info.grob ()->internal_has_interface (ly_symbol2scm ("DynamicText")))
acknowledge_extra_object (info);
}
acknowledge_extra_object (info);
}
-
-
-
void
Slur_engraver::finalize ()
{
#include "translator.icc"
-ADD_ACKNOWLEDGER (Slur_engraver,note_column);
-ADD_ACKNOWLEDGER (Slur_engraver,accidental);
-ADD_ACKNOWLEDGER (Slur_engraver,fingering)
-ADD_ACKNOWLEDGER (Slur_engraver,script);
-ADD_ACKNOWLEDGER (Slur_engraver,tie);
-ADD_ACKNOWLEDGER (Slur_engraver,text_script);
+ADD_ACKNOWLEDGER (Slur_engraver, accidental);
+ADD_ACKNOWLEDGER (Slur_engraver, dynamic_line_spanner);
+ADD_ACKNOWLEDGER (Slur_engraver, fingering);
+ADD_ACKNOWLEDGER (Slur_engraver, note_column);
+ADD_ACKNOWLEDGER (Slur_engraver, script);
+ADD_ACKNOWLEDGER (Slur_engraver, text_script);
+ADD_ACKNOWLEDGER (Slur_engraver, tie);
+ADD_ACKNOWLEDGER (Slur_engraver, tuplet_number);
ADD_TRANSLATOR (Slur_engraver,
- /* descr */ "Build slurs grobs from slur events",
- /* creats*/ "Slur",
- /* accepts */ "slur-event",
- /* reads */ "slurMelismaBusy doubleSlurs",
+ /* doc */ "Build slur grobs from slur events",
+ /* create */ "Slur",
+ /* accept */ "slur-event",
+ /* read */ "slurMelismaBusy doubleSlurs",
/* write */ "");