* lily/pango-font.cc (pango_item_string_stencil): use

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

diff --git a/lily/chord-tremolo-iterator.cc b/lily/chord-tremolo-iterator.cc
index 7cec33c3026daaa5d33fbb5b0fd942e1a9291988..b6f1c4f69a63ca8b6447f7864b9d2bc892e208b9 100644 (file)
--- a/lily/chord-tremolo-iterator.cc
+++ b/lily/chord-tremolo-iterator.cc
@@ -1,28 +1,24 @@
-/*   
-  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--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
 
+  (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.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 "international.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_ = 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 ()
@@ -31,21 +27,35 @@ Chord_tremolo_iterator::Chord_tremolo_iterator ()
   child_iter_ = 0;
 }
 
-Chord_tremolo_iterator::Chord_tremolo_iterator (Chord_tremolo_iterator const &src)
-  : Music_iterator (src)
+void
+Chord_tremolo_iterator::do_quit ()
+{
+  if (child_iter_)
+    child_iter_->quit ();
+}
+
+void
+Chord_tremolo_iterator::derived_mark () const
+{
+  if (child_iter_)
+    scm_gc_mark (child_iter_->self_scm ());
+}
+
+void
+Chord_tremolo_iterator::derived_substitute (Context *f, Context *t)
 {
-  factor_ = src.factor_;
-  child_iter_ = src.child_iter_ ? src.child_iter_->clone () : 0; 
+  if (child_iter_)
+    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)
-       set_translator (yeah->report_to ());
+       set_context (yeah->get_outlet ());
       else
        get_music ()->origin ()->warning (_ ("no one to print a tremolos"));
     }
@@ -65,18 +75,11 @@ Chord_tremolo_iterator::ok () const
   return child_iter_ && child_iter_->ok ();
 }
 
-Chord_tremolo_iterator::~Chord_tremolo_iterator ()
-{
-  delete child_iter_;
-}
-
-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);
 }
 
-
-
 IMPLEMENT_CTOR_CALLBACK (Chord_tremolo_iterator);