patch::: 1.5.41.jcn1

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

diff --git a/lily/chord-tremolo-iterator.cc b/lily/chord-tremolo-iterator.cc
index 0f86e33d98a77cd6899a22951ddaf4fc3bf73c19..e512cda4d968cef8cea54ea2b4f342ecc99334f1 100644 (file)
--- a/lily/chord-tremolo-iterator.cc
+++ b/lily/chord-tremolo-iterator.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -19,27 +19,33 @@
 void
 Chord_tremolo_iterator::construct_children ()
 {
-  Repeated_music * rep = dynamic_cast<Repeated_music*> (music_l_);
-  factor_  = Moment (1, rep->repeats_i_);
+  Repeated_music * rep = dynamic_cast<Repeated_music*> (music_l ());
+  factor_  = Moment (Rational(1, rep->repeat_count ()));
   child_iter_p_ = get_iterator_p (rep->body ());
 }
 
-Chord_tremolo_iterator::Chord_tremolo_iterator()
+Chord_tremolo_iterator::Chord_tremolo_iterator ()
 {
   factor_ = 1;
   child_iter_p_ = 0;
 }
 
+Chord_tremolo_iterator::Chord_tremolo_iterator (Chord_tremolo_iterator const &src)
+  : Music_iterator (src)
+{
+  child_iter_p_ = src.child_iter_p_? src.child_iter_p_->clone () : 0; 
+}
+
 void
 Chord_tremolo_iterator::process (Moment m)
 {
-  if (!m)
+  if (!m.to_bool () )
     {
-      Music_iterator *yeah = try_music (music_l_);
+      Music_iterator *yeah = try_music (music_l ());
       if (yeah)
        set_translator (yeah->report_to_l ());
       else
-       music_l_->origin ()->warning ( _("no one to print a tremolos"));
+       music_l ()->origin ()->warning (_ ("no one to print a tremolos"));
     }
 
   child_iter_p_->process (factor_ * m);
@@ -55,7 +61,7 @@ Chord_tremolo_iterator::pending_moment () const
 bool
 Chord_tremolo_iterator::ok () const
 {
-  return child_iter_p_ && child_iter_p_->ok();
+  return child_iter_p_ && child_iter_p_->ok ();
 }
 
 Chord_tremolo_iterator::~Chord_tremolo_iterator ()
@@ -70,3 +76,6 @@ Chord_tremolo_iterator::try_music_in_children (Music  *m) const
 }
 
 
+
+IMPLEMENT_CTOR_CALLBACK (Chord_tremolo_iterator);
+