* lily/include/translator.icc (ADD_ACKNOWLEDGER): new macro.

[lilypond.git] / lily / slur-engraver.cc

diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc
index cb1da18560ab0f92d92e7ba43401827817581b5f..8579bd8064f548f1944f2dd70655922601903a48 100644 (file)
--- a/lily/slur-engraver.cc
+++ b/lily/slur-engraver.cc
@@ -29,7 +29,14 @@ class Slur_engraver : public Engraver
 
 protected:
   virtual bool try_music (Music *);
-  virtual void acknowledge_grob (Grob_info);
+
+  DECLARE_ACKNOWLEDGER(note_column);
+  DECLARE_ACKNOWLEDGER(accidental);
+  DECLARE_ACKNOWLEDGER(fingering);
+  DECLARE_ACKNOWLEDGER(script);
+  DECLARE_ACKNOWLEDGER(tie);
+  DECLARE_ACKNOWLEDGER(text_script);
+  void acknowledge_extra_object (Grob_info);
   PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
   virtual void finalize ();
   PRECOMPUTED_VIRTUAL void process_music ();
@@ -70,42 +77,76 @@ Slur_engraver::set_melisma (bool m)
 }
 
 void
-Slur_engraver::acknowledge_grob (Grob_info info)
+Slur_engraver::acknowledge_note_column (Grob_info info)
 {
   Grob *e = info.grob ();
-  if (Note_column::has_interface (info.grob ()))
+  for (int i = slurs_.size (); i--;)
+    Slur::add_column (slurs_[i], e);
+  for (int i = end_slurs_.size (); i--;)
+    Slur::add_column (end_slurs_[i], e);
+}
+
+void
+Slur_engraver::acknowledge_extra_object (Grob_info info)
+{
+  Grob*e = info.grob ();
+  SCM inside = e->get_property ("inside-slur");
+  if (Tie::has_interface (e)
+      || to_boolean (inside))
     {
       for (int i = slurs_.size (); i--;)
-       Slur::add_column (slurs_[i], e);
+       Slur::add_extra_encompass (slurs_[i], e);
       for (int i = end_slurs_.size (); i--;)
-       Slur::add_column (end_slurs_[i], e);
+       Slur::add_extra_encompass (end_slurs_[i], e);
     }
-  else
+  else if (inside == SCM_BOOL_F)
     {
-      SCM inside = e->get_property ("inside-slur");
-      if (Tie::has_interface (e)
-         || to_boolean (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)
+      Grob *slur = slurs_.size () ? slurs_[0] : 0;
+      slur = (end_slurs_.size () && !slur)
+       ? end_slurs_[0] : slur;
+
+      if (slur)
        {
-         Grob *slur = slurs_.size () ? slurs_[0] : 0;
-         slur = (end_slurs_.size () && !slur)
-           ? end_slurs_[0] : slur;
-
-         if (slur)
-           {
-             e->add_offset_callback (Slur::outside_slur_callback_proc, Y_AXIS);
-             e->set_object ("slur", slur->self_scm ());
-           }
+         e->add_offset_callback (Slur::outside_slur_callback_proc, Y_AXIS);
+         e->set_object ("slur", slur->self_scm ());
        }
     }
 }
 
+void
+Slur_engraver::acknowledge_accidental (Grob_info info)
+{
+  acknowledge_extra_object (info);
+}
+
+
+void
+Slur_engraver::acknowledge_fingering (Grob_info info)
+{
+  acknowledge_extra_object (info);
+}
+
+void
+Slur_engraver::acknowledge_script (Grob_info info)
+{
+  acknowledge_extra_object (info);
+}
+
+void
+Slur_engraver::acknowledge_text_script (Grob_info info)
+{
+  acknowledge_extra_object (info);
+}
+
+void
+Slur_engraver::acknowledge_tie (Grob_info info)
+{
+  acknowledge_extra_object (info);
+}
+
+
+
+
 void
 Slur_engraver::finalize ()
 {
@@ -158,10 +199,16 @@ Slur_engraver::stop_translation_timestep ()
 
 #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_TRANSLATOR (Slur_engraver,
                /* descr */ "Build slurs grobs from slur events",
                /* creats*/ "Slur",
                /* accepts */ "slur-event",
-               /* acks  */ "note-column-interface accidental-interface fingering-interface script-interface tie-interface text-script-interface",
+               /* acks  */ "",
                /* reads */ "slurMelismaBusy doubleSlurs",
                /* write */ "");