remove PDF related files

[lilypond.git] / lily / folded-repeat-iterator.cc

diff --git a/lily/folded-repeat-iterator.cc b/lily/folded-repeat-iterator.cc
index cf9b5438edbdddb37e277c8e90ff222ead814389..62459136ebfe962fb6009b00eb109ec304ba2280 100644 (file)
--- a/lily/folded-repeat-iterator.cc
+++ b/lily/folded-repeat-iterator.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -11,7 +11,6 @@
 
 #include "input.hh"
 #include "repeated-music.hh"
-#include "music-list.hh"
 #include "simultaneous-music-iterator.hh"
 #include "context.hh"
 
@@ -47,8 +46,8 @@ Folded_repeat_iterator::pending_moment () const
 void
 Folded_repeat_iterator::construct_children ()
 {
-  Repeated_music  *  mus = dynamic_cast<Repeated_music*> (get_music ());
-  main_iter_ = unsmob_iterator (get_iterator (mus->body ()));
+  Music  *mus = get_music ();
+  main_iter_ = unsmob_iterator (get_iterator (Repeated_music::body (mus)));
   if (!main_iter_->ok ())
     {
       leave_body ();
@@ -84,7 +83,7 @@ Folded_repeat_iterator::process (Moment m)
       if (!alternative_iter_->ok ())
        {
          alternative_iter_->quit ();
-         alternative_iter_ =0;
+         alternative_iter_ = 0;
        }
     }
 }
@@ -92,18 +91,18 @@ Folded_repeat_iterator::process (Moment m)
 void
 Folded_repeat_iterator::leave_body ()
 {
-  Repeated_music *  mus = dynamic_cast<Repeated_music *> (get_music ());
+  Music *mus = get_music ();
 
   main_iter_->quit ();
   main_iter_ = 0;
-  main_length_mom_ +=  mus->body ()->get_length ();
+  main_length_mom_ +=  Repeated_music::body (mus)->get_length ();
 }
 
 void
 Folded_repeat_iterator::enter_alternative ()
 {
-  Repeated_music *  mus = dynamic_cast<Repeated_music *> (get_music ());  
-  if (mus->alternatives ())
+  Music *mus = get_music (); 
+  if (scm_is_pair (Repeated_music::alternatives (mus)))
     {
       /*
        ugh.
@@ -144,9 +143,9 @@ void
 Folded_repeat_iterator::derived_substitute (Context *f, Context *t) 
 {
   if (main_iter_)
-    main_iter_->substitute_outlet (f,t);
+    main_iter_->substitute_outlet (f, t);
   if (alternative_iter_)
-    alternative_iter_->substitute_outlet (f,t);
+    alternative_iter_->substitute_outlet (f, t);
 }
 
 IMPLEMENT_CTOR_CALLBACK (Folded_repeat_iterator);