X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Farpeggio-engraver.cc;h=e0face3d7a0d82fc4a8ee9c235d1cd1053a167be;hb=8e2eaf4959bec63a1128a444591a540f4f1e2937;hp=f9a2ee65bb30963457781189592e69ce5147d41e;hpb=36a6f2b9ff4c934b385fde74d1506d30da6b2fb8;p=lilypond.git

diff --git a/lily/arpeggio-engraver.cc b/lily/arpeggio-engraver.cc
index f9a2ee65bb..e0face3d7a 100644
--- a/lily/arpeggio-engraver.cc
+++ b/lily/arpeggio-engraver.cc
@@ -1,115 +1,134 @@
-/*   
-  arpeggio-engraver.cc -- implement Arpeggio_engraver
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 2000--2015 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 "group-interface.hh"
-#include "item.hh"
-#include "musical-request.hh"
+
 #include "arpeggio.hh"
-#include "stem.hh"
-#include "local-key-item.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 "staff-symbol-referencer.hh"
+#include "stem.hh"
+#include "stream-event.hh"
+
+#include "translator.icc"
 
 class Arpeggio_engraver : public Engraver
 {
 public:
-  VIRTUAL_COPY_CONS (Translator);
-  Arpeggio_engraver ();
+  TRANSLATOR_DECLARATIONS (Arpeggio_engraver);
 
-protected:
-  virtual void acknowledge_element (Score_element_info);
-  virtual void process_acknowledged ();
-  virtual void do_pre_move_processing ();
-  virtual bool do_try_music (Music *);
+  void acknowledge_stem (Grob_info);
+  void acknowledge_rhythmic_head (Grob_info);
+  void acknowledge_note_column (Grob_info);
 
+protected:
+  void process_music ();
+  void stop_translation_timestep ();
+  void listen_arpeggio (Stream_event *);
 private:
-  Item* arpeggio_; 
-  Arpeggio_req *arpeggio_req_;
-  Link_array <Score_element> stems_;
-  Link_array<Score_element> supports_;
+  Item *arpeggio_;
+  Stream_event *arpeggio_event_;
 };
 
-Arpeggio_engraver::Arpeggio_engraver ()
+Arpeggio_engraver::Arpeggio_engraver (Context *c)
+  : Engraver (c)
 {
   arpeggio_ = 0;
-  arpeggio_req_ = 0;
+  arpeggio_event_ = 0;
 }
 
-bool
-Arpeggio_engraver::do_try_music (Music* m)
+void Arpeggio_engraver::listen_arpeggio (Stream_event *ev)
 {
-  if (!arpeggio_req_)
-    {
-      if (Arpeggio_req *a = dynamic_cast<Arpeggio_req*> (m))
-	{
-	  arpeggio_req_ = a;
-	  return true;
-	}
-    }
-  return false;
+  ASSIGN_EVENT_ONCE (arpeggio_event_, ev);
 }
 
 void
-Arpeggio_engraver::acknowledge_element (Score_element_info info)
+Arpeggio_engraver::acknowledge_stem (Grob_info info)
 {
-  if (arpeggio_req_)
+  if (arpeggio_)
     {
-      if (Stem::has_interface (info.elem_l_))
-	{
-	  stems_.push (info.elem_l_);
-	}
-      else if (Rhythmic_head::has_interface (info.elem_l_)
-	       || Local_key_item::has_interface (info.elem_l_))
-	{
-	  supports_.push (info.elem_l_);
-	}
+      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::process_acknowledged ()
+Arpeggio_engraver::acknowledge_rhythmic_head (Grob_info info)
 {
-  if (!arpeggio_ && !stems_.empty ())
-    {
-      arpeggio_ = new Item (get_property ("Arpeggio"));
-      arpeggio_->set_parent (stems_[0], Y_AXIS);
-      Side_position::set_axis (arpeggio_, X_AXIS);
-      Side_position::set_direction (arpeggio_, LEFT);
-      Staff_symbol_referencer::set_interface (arpeggio_);
-      Pointer_group_interface pgi (arpeggio_, "stems");
-      for (int i = 0; i < stems_.size (); i++)
-	{
-	  pgi.add_element (stems_[i]);
-	  //Side_position::add_support (arpeggio_, stems_[i]);
-	}
-      for (int i = 0; i < supports_.size (); i++)
-	{
-	  ;//Side_position::add_support (arpeggio_, supports_[i]);
-	}
-      announce_element (arpeggio_, arpeggio_req_);
-    }
+  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::do_pre_move_processing ()
+Arpeggio_engraver::acknowledge_note_column (Grob_info info)
 {
   if (arpeggio_)
+    Separation_item::add_conditional_item (info.grob (), arpeggio_);
+}
+
+void
+Arpeggio_engraver::process_music ()
+{
+  if (arpeggio_event_)
     {
-      typeset_element (arpeggio_);
-      arpeggio_ = 0;
+      arpeggio_ = make_item ("Arpeggio", arpeggio_event_->self_scm ());
     }
-  arpeggio_req_ = 0;
-  stems_.clear ();
-  supports_.clear ();
 }
 
+void
+Arpeggio_engraver::stop_translation_timestep ()
+{
+  arpeggio_ = 0;
+  arpeggio_event_ = 0;
+}
+
+
+void
+Arpeggio_engraver::boot ()
+{
+  ADD_LISTENER (Arpeggio_engraver, arpeggio);
+  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",
 
-ADD_THIS_TRANSLATOR (Arpeggio_engraver);
+                /* read */
+                "",
 
+                /* write */
+                ""
+               );