* lily/rest.cc (y_offset_callback): merge function of 3 callbacks.

[lilypond.git] / lily / chord-tremolo-iterator.cc

diff --git a/lily/chord-tremolo-iterator.cc b/lily/chord-tremolo-iterator.cc
index aa193474716fb8b34937c6ddda3d36e08d67f9b2..b7d3bc826e5ff52777306766e548d36da6f5369d 100644 (file)
--- a/lily/chord-tremolo-iterator.cc
+++ b/lily/chord-tremolo-iterator.cc
@@ -1,28 +1,23 @@
-/*   
-  chord-tremolo-iterator.cc --  implement Chord_tremolo_iterator
-  
+/*
+  chord-tremolo-iterator.cc -- implement Chord_tremolo_iterator
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
 
+  (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+*/
 
-/*
-  this is culled from various other iterators, but sharing code by
-  subclassing proved to be too difficult.
- */
+#include "chord-tremolo-iterator.hh"
 
 #include "input.hh"
-#include "chord-tremolo-iterator.hh"
 #include "repeated-music.hh"
 
 void
 Chord_tremolo_iterator::construct_children ()
 {
-  Repeated_music * rep = dynamic_cast<Repeated_music*> (get_music ());
-  factor_  = Moment (Rational (1, 1));
-  child_iter_ = unsmob_iterator (get_iterator (rep->body ()));
+  Music *m = get_music ();
+
+  factor_ = Moment (Rational (1, 1));
+  child_iter_ = unsmob_iterator (get_iterator (Repeated_music::body (m)));
 }
 
 Chord_tremolo_iterator::Chord_tremolo_iterator ()
@@ -46,16 +41,16 @@ Chord_tremolo_iterator::derived_mark () const
 }
 
 void
-Chord_tremolo_iterator::derived_substitute (Context *f, Context *t) 
+Chord_tremolo_iterator::derived_substitute (Context *f, Context *t)
 {
   if (child_iter_)
-    child_iter_->substitute_outlet (f,t);
+    child_iter_->substitute_outlet (f, t);
 }
 
 void
 Chord_tremolo_iterator::process (Moment m)
 {
-  if (!m.to_bool () )
+  if (!m.to_bool ())
     {
       Music_iterator *yeah = try_music (get_music ());
       if (yeah)
@@ -79,8 +74,8 @@ Chord_tremolo_iterator::ok () const
   return child_iter_ && child_iter_->ok ();
 }
 
-Music_iterator*
-Chord_tremolo_iterator::try_music_in_children (Music  *m) const
+Music_iterator *
+Chord_tremolo_iterator::try_music_in_children (Music *m) const
 {
   return child_iter_->try_music (m);
 }