X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Funfolded-repeat-iterator.cc;h=0dd91b2352428af70e9e4a4a3bd7cf5f1ab85694;hb=9362af693c2e902d788067f9aff3654ad45d04ff;hp=fac94cece6b0a8594a4b2414165111ab9dcdbcfb;hpb=e58fce49b3113408254011774685370b8233df17;p=lilypond.git

diff --git a/lily/unfolded-repeat-iterator.cc b/lily/unfolded-repeat-iterator.cc
index fac94cece6..0dd91b2352 100644
--- a/lily/unfolded-repeat-iterator.cc
+++ b/lily/unfolded-repeat-iterator.cc
@@ -4,19 +4,18 @@ unfolded-repeat-iterator.cc --  implement Unfolded_repeat_iterator, Volta_repeat
 source file of the GNU LilyPond music typesetter
 
 
-(c) 2002--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+(c) 2002--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
 #include "music.hh"
 #include "sequential-iterator.hh"
-#include "translator-group.hh"
+#include "context.hh"
 
 class Unfolded_repeat_iterator : public Sequential_iterator
 {
 public:
-  DECLARE_SCHEME_CALLBACK(constructor, ());
-  VIRTUAL_COPY_CONS (Music_iterator);
+  DECLARE_SCHEME_CALLBACK (constructor, ());
 protected:
   virtual SCM get_music_list () const;
 };
@@ -28,25 +27,25 @@ Unfolded_repeat_iterator::get_music_list () const
   SCM l = SCM_EOL;
   SCM *tail = &l;
   
-  SCM body = get_music ()->get_mus_property ("element");
-  SCM alts = get_music ()->get_mus_property ("elements");
+  SCM body = get_music ()->get_property ("element");
+  SCM alts = get_music ()->get_property ("elements");
   int alt_count = scm_ilength (alts);
-  int rep_count = gh_scm2int (get_music ()->get_mus_property ("repeat-count"));
+  int rep_count = ly_scm2int (get_music ()->get_property ("repeat-count"));
 
   for (int i = 0; i < rep_count; i++)
     {
       if (unsmob_music (body))
-	*tail = gh_cons (body, SCM_EOL) ;
+	*tail = scm_cons (body, SCM_EOL) ;
 
       tail = SCM_CDRLOC (*tail);
 
       if (alt_count)
 	{
-	  *tail = gh_cons (gh_car (alts), SCM_EOL);
+	  *tail = scm_cons (ly_car (alts), SCM_EOL);
 	  tail = SCM_CDRLOC (*tail);
 	  if (i >= rep_count - alt_count)
 	    
-	    alts = gh_cdr (alts);
+	    alts = ly_cdr (alts);
 	}      
     }
 
@@ -56,15 +55,14 @@ Unfolded_repeat_iterator::get_music_list () const
 class Volta_repeat_iterator : public Sequential_iterator
 {
 public:
-  DECLARE_SCHEME_CALLBACK(constructor, ());
-  VIRTUAL_COPY_CONS (Music_iterator);
-  Volta_repeat_iterator();
+  DECLARE_SCHEME_CALLBACK (constructor, ());
+  Volta_repeat_iterator ();
 
   void add_repeat_command (SCM);
 protected:
   virtual SCM get_music_list () const;
   virtual void next_element (bool);
-  virtual void construct_children();
+  virtual void construct_children ();
   virtual void process (Moment);
 
   bool first_time_;
@@ -74,28 +72,28 @@ protected:
 };
 
 
-Volta_repeat_iterator::Volta_repeat_iterator()
+Volta_repeat_iterator::Volta_repeat_iterator ()
 {
   done_count_ = alt_count_ = rep_count_= 0;
   first_time_ = true;
 }
 
 SCM
-Volta_repeat_iterator::get_music_list()const
+Volta_repeat_iterator::get_music_list ()const
 {
-  return gh_cons (get_music ()->get_mus_property ("element"),
-		  get_music ()->get_mus_property ("elements"));
+  return scm_cons (get_music ()->get_property ("element"),
+		  get_music ()->get_property ("elements"));
 }
 
 void
 Volta_repeat_iterator::construct_children ()
 {
-  Sequential_iterator::construct_children();
+  Sequential_iterator::construct_children ();
   
-  SCM alts = get_music ()->get_mus_property ("elements");
+  SCM alts = get_music ()->get_property ("elements");
 
   alt_count_ = scm_ilength (alts);
-  rep_count_ = gh_scm2int (get_music ()->get_mus_property ("repeat-count"));
+  rep_count_ = ly_scm2int (get_music ()->get_property ("repeat-count"));
   done_count_ = 0;
 }
 
@@ -109,11 +107,11 @@ Volta_repeat_iterator::add_repeat_command (SCM what)
   SCM reps = ly_symbol2scm ("repeatCommands");
   SCM current_reps = get_outlet ()->internal_get_property (reps);
 
-  Translator_group * where = get_outlet ()->where_defined (reps);
+  Context * where = get_outlet ()->where_defined (reps);
   if (where
-      && current_reps == SCM_EOL || gh_pair_p (current_reps))
+      && current_reps == SCM_EOL || ly_c_pair_p (current_reps))
     {
-      current_reps = gh_cons (what, current_reps);
+      current_reps = scm_cons (what, current_reps);
       where->internal_set_property (reps, current_reps);
     }
 }
@@ -166,9 +164,9 @@ Volta_repeat_iterator::process (Moment m)
       add_repeat_command (ly_symbol2scm ("start-repeat"));
       first_time_ = false;
     }
-  Sequential_iterator::process(m);
+  Sequential_iterator::process (m);
 }
 
 
-IMPLEMENT_CTOR_CALLBACK(Volta_repeat_iterator);
-IMPLEMENT_CTOR_CALLBACK(Unfolded_repeat_iterator);
+IMPLEMENT_CTOR_CALLBACK (Volta_repeat_iterator);
+IMPLEMENT_CTOR_CALLBACK (Unfolded_repeat_iterator);