X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fevent-chord-iterator.cc;h=92b385fe57651eff555d4b74b3ba9cf5c5a13e76;hb=b872748c6aa8bb721ced458691b38ac2fac5dfc8;hp=60e7e3081a0ba00fce334c5ec16f5527181ceae1;hpb=9f3572d98bb948c9689cd1f75401a029451fa001;p=lilypond.git

diff --git a/lily/event-chord-iterator.cc b/lily/event-chord-iterator.cc
index 60e7e3081a..92b385fe57 100644
--- a/lily/event-chord-iterator.cc
+++ b/lily/event-chord-iterator.cc
@@ -1,19 +1,30 @@
 /*
-  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--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.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 "event-chord-iterator.hh"
 
 #include "context.hh"
+#include "dispatcher.hh"
 #include "duration.hh"
 #include "input.hh"
 #include "international.hh"
 #include "music.hh"
-#include "pitch.hh"
 #include "warn.hh"
 
 Event_chord_iterator::Event_chord_iterator ()
@@ -33,11 +44,17 @@ Event_chord_iterator::process (Moment m)
   if (last_processed_mom_ < Moment (0))
     {
       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);
-	}
+           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);
+        }
     }
   Simple_music_iterator::process (m);
 }