X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Farpeggio-engraver.cc;h=e191470161d99070b8f03597168b82e2b3eadcb2;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=0e36185ba1e5ed6b52c84bacf2f27d2c1bcc93f0;hpb=83ed05cef3bfcbd69f4148e8ee0669ca0664e214;p=lilypond.git

diff --git a/lily/arpeggio-engraver.cc b/lily/arpeggio-engraver.cc
index 0e36185ba1..e191470161 100644
--- a/lily/arpeggio-engraver.cc
+++ b/lily/arpeggio-engraver.cc
@@ -1,19 +1,33 @@
 /*
-  arpeggio-engraver.cc -- implement Arpeggio_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2000--2015 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 2000--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "engraver.hh"
 
-#include "pointer-group-interface.hh"
 #include "arpeggio.hh"
-#include "stem.hh"
+#include "item.hh"
+#include "note-column.hh"
+#include "pointer-group-interface.hh"
 #include "rhythmic-head.hh"
+#include "separation-item.hh"
 #include "side-position-interface.hh"
-#include "note-column.hh"
+#include "stem.hh"
+#include "stream-event.hh"
 
 #include "translator.icc"
 
@@ -25,13 +39,14 @@ public:
   void acknowledge_stem (Grob_info);
   void acknowledge_rhythmic_head (Grob_info);
   void acknowledge_note_column (Grob_info);
+
 protected:
-  PRECOMPUTED_VIRTUAL void process_music ();
-  PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
-  virtual bool try_music (Music *);
+  void process_music ();
+  void stop_translation_timestep ();
+  DECLARE_TRANSLATOR_LISTENER (arpeggio);
 private:
   Item *arpeggio_;
-  Music *arpeggio_event_;
+  Stream_event *arpeggio_event_;
 };
 
 Arpeggio_engraver::Arpeggio_engraver ()
@@ -40,14 +55,10 @@ Arpeggio_engraver::Arpeggio_engraver ()
   arpeggio_event_ = 0;
 }
 
-bool
-Arpeggio_engraver::try_music (Music *m)
+IMPLEMENT_TRANSLATOR_LISTENER (Arpeggio_engraver, arpeggio);
+void Arpeggio_engraver::listen_arpeggio (Stream_event *ev)
 {
-  if (!arpeggio_event_)
-    {
-      arpeggio_event_ = m;
-    }
-  return true;
+  ASSIGN_EVENT_ONCE (arpeggio_event_, ev);
 }
 
 void
@@ -56,11 +67,11 @@ Arpeggio_engraver::acknowledge_stem (Grob_info info)
   if (arpeggio_)
     {
       if (!arpeggio_->get_parent (Y_AXIS))
-	arpeggio_->set_parent (info.grob (), Y_AXIS);
+        arpeggio_->set_parent (info.grob (), Y_AXIS);
 
       Pointer_group_interface::add_grob (arpeggio_,
-					 ly_symbol2scm ("stems"),
-					 info.grob ());
+                                         ly_symbol2scm ("stems"),
+                                         info.grob ());
     }
 }
 void
@@ -72,18 +83,14 @@ Arpeggio_engraver::acknowledge_rhythmic_head (Grob_info info)
       We can't catch local key items (accidentals) from Voice context,
       see Local_key_engraver
     */
-    {
-      Side_position_interface::add_support (arpeggio_, info.grob ());
-    }
+    Side_position_interface::add_support (arpeggio_, info.grob ());
 }
- 
+
 void
 Arpeggio_engraver::acknowledge_note_column (Grob_info info)
 {
   if (arpeggio_)
-    {
-      info.grob ()->set_object ("arpeggio", arpeggio_->self_scm ());
-    }
+    Separation_item::add_conditional_item (info.grob (), arpeggio_);
 }
 
 void
@@ -102,14 +109,20 @@ Arpeggio_engraver::stop_translation_timestep ()
   arpeggio_event_ = 0;
 }
 
-ADD_ACKNOWLEDGER(Arpeggio_engraver, stem)
-ADD_ACKNOWLEDGER(Arpeggio_engraver, rhythmic_head)
-ADD_ACKNOWLEDGER(Arpeggio_engraver, note_column)
+ADD_ACKNOWLEDGER (Arpeggio_engraver, stem);
+ADD_ACKNOWLEDGER (Arpeggio_engraver, rhythmic_head);
+ADD_ACKNOWLEDGER (Arpeggio_engraver, note_column);
 
 ADD_TRANSLATOR (Arpeggio_engraver,
-		/* descr */ "Generate an Arpeggio symbol",
-		/* creats*/ "Arpeggio",
-		/* accepts */ "arpeggio-event",
-		/* acks  */ "",
-		/* reads */ "",
-		/* write */ "");
+                /* doc */
+                "Generate an Arpeggio symbol.",
+
+                /* create */
+                "Arpeggio",
+
+                /* read */
+                "",
+
+                /* write */
+                ""
+               );