release: 1.5.19

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

diff --git a/lily/unfolded-repeat-iterator.cc b/lily/unfolded-repeat-iterator.cc
index 8ad34fe33159c071c73ab4b3a93bcb7b13c04a43..7dd93bd1dcfa8ad4950ff6c8d93da9eb02c979f7 100644 (file)
--- a/lily/unfolded-repeat-iterator.cc
+++ b/lily/unfolded-repeat-iterator.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -56,7 +56,7 @@ public:
   
   /// pointer to the alternative that will be processed next.
   SCM alternative_cons_;
-  ~Unfolded_repeat_iterator();
+  ~Unfolded_repeat_iterator ();
   Unfolded_repeat_iterator ();
   Unfolded_repeat_iterator (Unfolded_repeat_iterator const &);
 protected:  
@@ -76,7 +76,7 @@ class Volta_repeat_iterator : public Unfolded_repeat_iterator
 public:
   Volta_repeat_iterator ();
   static  SCM constructor_cxx_function;
-  VIRTUAL_COPY_CONS(Music_iterator);
+  VIRTUAL_COPY_CONS (Music_iterator);
 };
 
 
@@ -120,7 +120,7 @@ the  alternative just set.
 void
 Unfolded_repeat_iterator::next_element (bool side_effect) 
 {
-  Repeated_music * repmus =dynamic_cast<Repeated_music *> (music_l_);
+  Repeated_music * repmus =dynamic_cast<Repeated_music *> (music_l ());
   delete current_iter_p_;
   current_iter_p_ =0;
 
@@ -145,7 +145,7 @@ Unfolded_repeat_iterator::next_element (bool side_effect)
      
       if (gh_pair_p (alternative_cons_))
        {
-         current_iter_p_ = get_iterator_p (unsmob_music (gh_car (alternative_cons_)));
+         current_iter_p_ = get_iterator_p (unsmob_music (ly_car (alternative_cons_)));
          do_main_b_ = false;
 
          if (volta_b_)
@@ -165,8 +165,8 @@ Unfolded_repeat_iterator::next_element (bool side_effect)
                }                 
              
              if (do_repcommands)
-               add_repeat_command (gh_list (ly_symbol2scm ("volta"),
-                                            ly_str02scm (repstr.ch_C()), SCM_UNDEFINED));
+               add_repeat_command (scm_list_n (ly_symbol2scm ("volta"),
+                                            ly_str02scm (repstr.ch_C ()), SCM_UNDEFINED));
            }     
        }
       else if (volta_b_)
@@ -192,14 +192,14 @@ Unfolded_repeat_iterator::next_element (bool side_effect)
        */
       if (alternative_cons_)
        {
-         here_mom_ += unsmob_music (gh_car (alternative_cons_))->length_mom ();
+         here_mom_ += unsmob_music (ly_car (alternative_cons_))->length_mom ();
 
          if (volta_b_ || 
              repmus->repeat_count () - done_count_  < alternative_count_i_)
-           alternative_cons_ = gh_cdr (alternative_cons_);
+           alternative_cons_ = ly_cdr (alternative_cons_);
          
          if (do_repcommands)
-           add_repeat_command (gh_list (ly_symbol2scm ("volta"), SCM_BOOL_F, SCM_UNDEFINED));
+           add_repeat_command (scm_list_n (ly_symbol2scm ("volta"), SCM_BOOL_F, SCM_UNDEFINED));
 
          
          
@@ -223,14 +223,14 @@ Unfolded_repeat_iterator::next_element (bool side_effect)
          if (do_repcommands)
            {
              String repstr = to_str (done_count_ + 1) + ".";
-             add_repeat_command (gh_list (ly_symbol2scm ("volta"),
-                                          ly_str02scm (repstr.ch_C()), SCM_UNDEFINED));
+             add_repeat_command (scm_list_n (ly_symbol2scm ("volta"),
+                                          ly_str02scm (repstr.ch_C ()), SCM_UNDEFINED));
              add_repeat_command (ly_symbol2scm ("end-repeat"));
            }
 
          
          if (volta_b_)
-           current_iter_p_ = get_iterator_p (unsmob_music (gh_car (alternative_cons_)));
+           current_iter_p_ = get_iterator_p (unsmob_music (ly_car (alternative_cons_)));
          else
            {
              current_iter_p_ = get_iterator_p (repmus->body ());
@@ -256,13 +256,13 @@ Unfolded_repeat_iterator::pending_moment () const
 void
 Unfolded_repeat_iterator::construct_children ()
 {
-  Repeated_music * mus =dynamic_cast<Repeated_music *> (music_l_);
+  Repeated_music * mus =dynamic_cast<Repeated_music *> (music_l ());
   
   alternative_cons_ = (mus->alternatives ())
-    ? mus->alternatives ()->music_list ()
+    ? mus->alternatives ()
     : SCM_EOL;
 
-  for (SCM p = alternative_cons_; gh_pair_p (p); p = gh_cdr (p))
+  for (SCM p = alternative_cons_; gh_pair_p (p); p = ly_cdr (p))
     alternative_count_i_ ++;
 
   if (mus->body ())
@@ -272,13 +272,13 @@ Unfolded_repeat_iterator::construct_children ()
     }
   else if (gh_pair_p (alternative_cons_))
     {
-      current_iter_p_ = get_iterator_p (unsmob_music (gh_car (alternative_cons_)));
+      current_iter_p_ = get_iterator_p (unsmob_music (ly_car (alternative_cons_)));
       do_main_b_ = false;
     }
 
-  while (current_iter_p_ && !current_iter_p_-> ok())
+  while (current_iter_p_ && !current_iter_p_-> ok ())
     {
-      next_element(true);
+      next_element (true);
     }
 }
 
@@ -289,21 +289,21 @@ void
 Unfolded_repeat_iterator::add_repeat_command (SCM what)
 {
   SCM reps = ly_symbol2scm ("repeatCommands");
-  SCM current_reps = report_to_l ()->get_property(reps);
+  SCM current_reps = report_to_l ()->get_property (reps);
 
   Translator_group * where = report_to_l ()->where_defined (reps);
   if (where
       && current_reps == SCM_EOL || gh_pair_p (current_reps))
     {
       current_reps = gh_cons (what, current_reps);
-      where->set_property (reps, current_reps);
+      where->internal_set_property (reps, current_reps);
     }
 }
 
 void
 Unfolded_repeat_iterator::process (Moment m) 
 {
-  if (!m)
+  if (!m.to_bool ())
     {
       if (volta_b_)
        add_repeat_command (ly_symbol2scm ("start-repeat"));
@@ -312,7 +312,7 @@ Unfolded_repeat_iterator::process (Moment m)
     {
       while (!current_iter_p_->ok ())
        {
-         next_element(true);
+         next_element (true);
 
          if (!current_iter_p_)
            return;
@@ -360,8 +360,8 @@ Unfolded_repeat_iterator::get_music (Moment until)const
       s = gh_append2 (nm, s);
       
       Moment m = 0;
-      for (SCM i = nm; gh_pair_p(i); i = gh_cdr (i))
-       m = m >? unsmob_music (gh_car (i))->length_mom ();
+      for (SCM i = nm; gh_pair_p (i); i = ly_cdr (i))
+       m = m >? unsmob_music (ly_car (i))->length_mom ();
 
       if (m > Moment (0))
        break ;
@@ -381,8 +381,8 @@ Unfolded_repeat_iterator::try_music_in_children (Music  * m) const
   return  current_iter_p_->try_music (m);
 }
 
-IMPLEMENT_CTOR_CALLBACK(Unfolded_repeat_iterator);
-IMPLEMENT_CTOR_CALLBACK(Volta_repeat_iterator);
+IMPLEMENT_CTOR_CALLBACK (Unfolded_repeat_iterator);
+IMPLEMENT_CTOR_CALLBACK (Volta_repeat_iterator);
 
 Volta_repeat_iterator::Volta_repeat_iterator ()
 {