* Documentation/user/refman.itely: remove superfluous -'s

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

diff --git a/lily/unfolded-repeat-iterator.cc b/lily/unfolded-repeat-iterator.cc
index ff5cf9603d7ede3bae925250e723bb6da8de2d23..27141d0e27f5a4b56cdca686eb76919a9924c10a 100644 (file)
--- a/lily/unfolded-repeat-iterator.cc
+++ b/lily/unfolded-repeat-iterator.cc
@@ -4,7 +4,7 @@ unfolded-repeat-iterator.cc --  implement Unfolded_repeat_iterator, Volta_repeat
 source file of the GNU LilyPond music typesetter
 
 
-(c) 2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+(c) 2002--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -15,7 +15,7 @@ source file of the GNU LilyPond music typesetter
 class Unfolded_repeat_iterator : public Sequential_iterator
 {
 public:
-  static  SCM constructor_cxx_function;
+  DECLARE_SCHEME_CALLBACK(constructor, ());
   VIRTUAL_COPY_CONS (Music_iterator);
 protected:
   virtual SCM get_music_list () const;
@@ -56,7 +56,7 @@ Unfolded_repeat_iterator::get_music_list () const
 class Volta_repeat_iterator : public Sequential_iterator
 {
 public:
-  static  SCM constructor_cxx_function;
+  DECLARE_SCHEME_CALLBACK(constructor, ());
   VIRTUAL_COPY_CONS (Music_iterator);
   Volta_repeat_iterator();
 
@@ -66,7 +66,8 @@ protected:
   virtual void next_element (bool);
   virtual void construct_children();
   virtual void process (Moment);
-  
+
+  bool first_time_;
   int alt_count_;
   int rep_count_;
   int done_count_;
@@ -76,6 +77,7 @@ protected:
 Volta_repeat_iterator::Volta_repeat_iterator()
 {
   done_count_ = alt_count_ = rep_count_= 0;
+  first_time_ = true;
 }
 
 SCM
@@ -146,7 +148,7 @@ Volta_repeat_iterator::next_element (bool side_effect)
 
          if (done_count_ <= alt_count_)
            add_repeat_command (scm_list_n (ly_symbol2scm ("volta"),
-                                           ly_str02scm (repstr.to_str0 ()), SCM_UNDEFINED));
+                                           scm_makfrom0str (repstr.to_str0 ()), SCM_UNDEFINED));
        }
       else
        {
@@ -159,9 +161,10 @@ Volta_repeat_iterator::next_element (bool side_effect)
 void
 Volta_repeat_iterator::process (Moment m)
 {
-  if (!m.to_bool ())
+  if (first_time_)
     {
       add_repeat_command (ly_symbol2scm ("start-repeat"));
+      first_time_ = false;
     }
   Sequential_iterator::process(m);
 }