From: hanwen <hanwen>
Date: Wed, 4 Feb 2004 17:31:12 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: release/2.1.18~3
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=607ced0cfed687c1a20a3f6238d6214aa33ff3de;p=lilypond.git

*** empty log message ***
---

diff --git a/lily/apply-context-iterator.cc b/lily/apply-context-iterator.cc
index 1da88fc09c..e08887c6f9 100644
--- a/lily/apply-context-iterator.cc
+++ b/lily/apply-context-iterator.cc
@@ -21,7 +21,7 @@ Apply_context_iterator::process (Moment m)
 
   scm_call_1 (proc, get_outlet ()->self_scm());
   
-  Simple_music_iterator::process(m);
+  Simple_music_iterator::process (m);
 }
 
 IMPLEMENT_CTOR_CALLBACK (Apply_context_iterator);
diff --git a/lily/change-iterator.cc b/lily/change-iterator.cc
index cda98a09d1..7d594273fd 100644
--- a/lily/change-iterator.cc
+++ b/lily/change-iterator.cc
@@ -81,6 +81,7 @@ Change_iterator::process (Moment m)
       }
   else
     error (_ ("none of these in my family"));
+
   Simple_music_iterator::process (m);
 }
 
diff --git a/lily/include/output-property-music-iterator.hh b/lily/include/output-property-music-iterator.hh
index 82ac7ed144..e69de29bb2 100644
--- a/lily/include/output-property-music-iterator.hh
+++ b/lily/include/output-property-music-iterator.hh
@@ -1,25 +0,0 @@
-/*   
-  output-property-music-iterator.hh -- declare Output_property_music_iterator
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c)  2000--2003 Jan Nieuwenhuizen <janneke@gnu.org>
- */
-
-#ifndef OUTPUT_PROPERTY_MUSIC_ITERATOR_HH
-#define OUTPUT_PROPERTY_MUSIC_ITERATOR_HH
-
-#include "simple-music-iterator.hh"
-
-class Output_property_music_iterator : public Simple_music_iterator
-{
-public:  
-  DECLARE_SCHEME_CALLBACK(constructor, ());
-  /* construction */
-protected:
-  virtual void process (Moment);
-};
-
-
-#endif /* OUTPUT_PROPERTY_MUSIC_ITERATOR_HH */
-
diff --git a/lily/output-property-music-iterator.cc b/lily/output-property-music-iterator.cc
index e8744e16b8..6b7cfca88a 100644
--- a/lily/output-property-music-iterator.cc
+++ b/lily/output-property-music-iterator.cc
@@ -8,15 +8,18 @@
 
 #include "input.hh"
 #include "music-list.hh"
-#include "output-property-music-iterator.hh"
+#include "simple-music-iterator.hh"
 
+class Output_property_music_iterator : public Simple_music_iterator
+{
+public:  
+  DECLARE_SCHEME_CALLBACK(constructor, ());
+  /* construction */
+protected:
+  virtual void process (Moment);
+};
 
-/*
-  Huh.
 
-  Why do we need this?
-  
- */
 void
 Output_property_music_iterator::process (Moment m)
 {
@@ -27,6 +30,7 @@ Output_property_music_iterator::process (Moment m)
 	get_music ()->origin ()->warning (_f ("Junking event: `%s'",
 					  classname (get_music ())));
     }
+  Simple_music_iterator::process (m);
 }
 
 IMPLEMENT_CTOR_CALLBACK (Output_property_music_iterator);