X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fevent-chord-iterator.cc;h=55d43302c556a32afbfe8f38bb76dc22a016fc28;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=c417e55917b574271d7748070be27af11e8c04c0;hpb=7aabfb20c46e0a1de41698ddc6859ccd3a6dea85;p=lilypond.git

diff --git a/lily/event-chord-iterator.cc b/lily/event-chord-iterator.cc
index c417e55917..55d43302c5 100644
--- a/lily/event-chord-iterator.cc
+++ b/lily/event-chord-iterator.cc
@@ -1,64 +1,41 @@
 /*
-  event-chord-iterator.cc -- implement Event_chord_iterator
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  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 "translator-group.hh"
-#include "warn.hh"
 #include "event-chord-iterator.hh"
-#include "music-list.hh"
-#include "event.hh"
 
-Event_chord_iterator::Event_chord_iterator ()
-{
-}
-
-Event_chord_iterator::Event_chord_iterator (Event_chord_iterator const &src)
-  : Simple_music_iterator (src)
-{
-}
+#include "context.hh"
+#include "dispatcher.hh"
+#include "duration.hh"
+#include "input.hh"
+#include "international.hh"
+#include "music.hh"
+#include "warn.hh"
 
-Translator_group*
-Event_chord_iterator::get_req_translator ()
+Event_chord_iterator::Event_chord_iterator ()
 {
-  assert (report_to ());
-  if (report_to ()->is_bottom_translator_b ())
-    return report_to ();
-
-  set_translator (report_to ()->get_default_interpreter ());
-  return report_to ();
 }
 
 void
 Event_chord_iterator::construct_children ()
 {
   Simple_music_iterator::construct_children ();
-  get_req_translator ();
-}
-
-Event_chord*
-Event_chord_iterator::get_elt () const
-{
-  return (Event_chord*) get_music ();
-}
-
-SCM
-Event_chord_iterator::get_pending_events (Moment) const
-{
-  SCM s = SCM_EOL;
-  if (last_processed_mom_ < Moment (0))
-    {
-      Music_sequence * ms = dynamic_cast<Music_sequence*> (get_music ());
-     
-      for (SCM m = ms->music_list (); gh_pair_p (m); m = ly_cdr (m))
-	{
-	  s = gh_cons (ly_car (m) , s);
-	}
-    }
-  return s;
+  descend_to_bottom_context ();
 }
 
 void
@@ -66,17 +43,20 @@ Event_chord_iterator::process (Moment m)
 {
   if (last_processed_mom_ < Moment (0))
     {
-      for (SCM s = dynamic_cast<Music_sequence *> (get_music ())->music_list ();
-	   gh_pair_p (s);  s = ly_cdr (s))
-	{
-	  Music *mus = unsmob_music (ly_car (s));
-
-	  bool gotcha = try_music (mus);
-	  if (!gotcha)
-	    mus->origin ()->warning (_f ("Junking event: `%s'", mus->name()));
-	}
+      for (SCM s = get_music ()->get_property ("elements");
+           scm_is_pair (s); s = scm_cdr (s))
+        {
+          Music *mus = unsmob_music (scm_car (s));
+          report_event (mus);
+        }
+      for (SCM s = get_music ()->get_property ("articulations");
+           scm_is_pair (s); s = scm_cdr (s))
+        {
+          Music *mus = unsmob_music (scm_car (s));
+          report_event (mus);
+        }
     }
-  skip (m);
+  Simple_music_iterator::process (m);
 }
 
 IMPLEMENT_CTOR_CALLBACK (Event_chord_iterator);