(parse_symbol_list): Bugfix.

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

diff --git a/lily/arpeggio-engraver.cc b/lily/arpeggio-engraver.cc
index 61dbe54f324232ee314f9fadb2172eb54f39e5c8..5c82930b4f14fdd8d49a64077c21fddadec0ba29 100644 (file)
--- a/lily/arpeggio-engraver.cc
+++ b/lily/arpeggio-engraver.cc
@@ -7,80 +7,91 @@
 */
 
 #include "engraver.hh"
-#include "group-interface.hh"
+
+#include "pointer-group-interface.hh"
 #include "arpeggio.hh"
 #include "stem.hh"
 #include "rhythmic-head.hh"
 #include "side-position-interface.hh"
 #include "note-column.hh"
 
+#include "translator.icc"
+
 class Arpeggio_engraver : public Engraver
 {
 public:
   TRANSLATOR_DECLARATIONS (Arpeggio_engraver);
 
+  void acknowledge_stem (Grob_info);
+  void acknowledge_rhythmic_head (Grob_info);
+  void acknowledge_note_column (Grob_info);
 protected:
-  virtual void acknowledge_grob (Grob_info);
-  virtual void process_music ();
-  virtual void stop_translation_timestep ();
+  void process_music ();
+  void stop_translation_timestep ();
   virtual bool try_music (Music *);
 private:
   Item *arpeggio_;
-  Music *arpeggio_req_;
+  Music *arpeggio_event_;
 };
 
 Arpeggio_engraver::Arpeggio_engraver ()
 {
   arpeggio_ = 0;
-  arpeggio_req_ = 0;
+  arpeggio_event_ = 0;
 }
 
 bool
 Arpeggio_engraver::try_music (Music *m)
 {
-  if (!arpeggio_req_)
+  if (!arpeggio_event_)
     {
-      arpeggio_req_ = m;
+      arpeggio_event_ = m;
     }
   return true;
 }
 
 void
-Arpeggio_engraver::acknowledge_grob (Grob_info info)
+Arpeggio_engraver::acknowledge_stem (Grob_info info)
+{
+  if (arpeggio_)
+    {
+      if (!arpeggio_->get_parent (Y_AXIS))
+       arpeggio_->set_parent (info.grob (), Y_AXIS);
+
+      Pointer_group_interface::add_grob (arpeggio_,
+                                        ly_symbol2scm ("stems"),
+                                        info.grob ());
+    }
+}
+void
+Arpeggio_engraver::acknowledge_rhythmic_head (Grob_info info)
+{
+  if (arpeggio_)
+
+    /*
+      We can't catch local key items (accidentals) from Voice context,
+      see Local_key_engraver
+    */
+    {
+      Side_position_interface::add_support (arpeggio_, info.grob ());
+    }
+}
+
+void
+Arpeggio_engraver::acknowledge_note_column (Grob_info info)
 {
   if (arpeggio_)
     {
-      if (Stem::has_interface (info.grob ()))
-       {
-         if (!arpeggio_->get_parent (Y_AXIS))
-           arpeggio_->set_parent (info.grob (), Y_AXIS);
-
-         Pointer_group_interface::add_grob (arpeggio_,
-                                            ly_symbol2scm ("stems"),
-                                            info.grob ());
-       }
-
-      /*
-       We can't catch local key items (accidentals) from Voice context,
-       see Local_key_engraver
-      */
-      else if (Rhythmic_head::has_interface (info.grob ()))
-       {
-         Side_position_interface::add_support (arpeggio_, info.grob ());
-       }
-      else if (Note_column::has_interface (info.grob ()))
-       {
-         info.grob ()->set_property ("arpeggio", arpeggio_->self_scm ());
-       }
+      info.grob ()->set_object ("arpeggio", arpeggio_->self_scm ());
     }
 }
 
 void
 Arpeggio_engraver::process_music ()
 {
-  if (arpeggio_req_)
+  if (arpeggio_event_)
     {
-      arpeggio_ = make_item ("Arpeggio", arpeggio_req_->self_scm ());
+      arpeggio_ = make_item ("Arpeggio", arpeggio_event_->self_scm ());
     }
 }
 
@@ -88,13 +99,16 @@ void
 Arpeggio_engraver::stop_translation_timestep ()
 {
   arpeggio_ = 0;
-  arpeggio_req_ = 0;
+  arpeggio_event_ = 0;
 }
 
-ADD_TRANSLATOR (Arpeggio_engraver,
-               /* descr */ "Generate an Arpeggio from a Arpeggio_req",
-               /* creats*/ "Arpeggio",
-               /* accepts */ "arpeggio-event",
-               /* acks  */ "stem-interface rhythmic-head-interface note-column-interface",
-               /* reads */ "",
-               /* write */ "");
+ADD_ACKNOWLEDGER (Arpeggio_engraver, stem)
+  ADD_ACKNOWLEDGER (Arpeggio_engraver, rhythmic_head)
+  ADD_ACKNOWLEDGER (Arpeggio_engraver, note_column)
+
+  ADD_TRANSLATOR (Arpeggio_engraver,
+                 /* doc */ "Generate an Arpeggio symbol",
+                 /* create */ "Arpeggio",
+                 /* accept */ "arpeggio-event",
+                 /* read */ "",
+                 /* write */ "");