X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Funfolded-repeat-iterator.cc;h=9bdf2a93a2123014bcd985a621cd24ab9a61bbea;hb=cd42fab34bab39b166f1e0581670852ee351940d;hp=c7a5db97f794f6926c1fa5f80017cd58e2f72de7;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git

diff --git a/lily/unfolded-repeat-iterator.cc b/lily/unfolded-repeat-iterator.cc
index c7a5db97f7..9bdf2a93a2 100644
--- a/lily/unfolded-repeat-iterator.cc
+++ b/lily/unfolded-repeat-iterator.cc
@@ -1,10 +1,20 @@
 /*
-  unfolded-repeat-iterator.cc -- implement Unfolded_repeat_iterator, Volta_repeat_iterator
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2002--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
-  (c) 2002--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "music.hh"
@@ -50,114 +60,4 @@ Unfolded_repeat_iterator::get_music_list () const
   return l;
 }
 
-class Volta_repeat_iterator : public Sequential_iterator
-{
-public:
-  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 process (Moment);
-
-  bool first_time_;
-  int alt_count_;
-  int rep_count_;
-  int done_count_;
-};
-
-Volta_repeat_iterator::Volta_repeat_iterator ()
-{
-  done_count_ = alt_count_ = rep_count_ = 0;
-  first_time_ = true;
-}
-
-SCM
-Volta_repeat_iterator::get_music_list ()const
-{
-  return scm_cons (get_music ()->get_property ("element"),
-		   get_music ()->get_property ("elements"));
-}
-
-void
-Volta_repeat_iterator::construct_children ()
-{
-  Sequential_iterator::construct_children ();
-
-  SCM alts = get_music ()->get_property ("elements");
-
-  alt_count_ = scm_ilength (alts);
-  rep_count_ = scm_to_int (get_music ()->get_property ("repeat-count"));
-  done_count_ = 0;
-}
-
-/*
-  TODO: add source information for debugging
-*/
-void
-Volta_repeat_iterator::add_repeat_command (SCM what)
-{
-  SCM reps = ly_symbol2scm ("repeatCommands");
-  SCM current_reps = get_outlet ()->internal_get_property (reps);
-
-  Context *where = get_outlet ()->where_defined (reps);
-  if (where
-      && current_reps == SCM_EOL || scm_is_pair (current_reps))
-    {
-      current_reps = scm_cons (what, current_reps);
-      where->internal_set_property (reps, current_reps);
-    }
-}
-
-void
-Volta_repeat_iterator::next_element (bool side_effect)
-{
-  done_count_++;
-
-  Sequential_iterator::next_element (side_effect);
-
-  if (side_effect)
-    {
-      if (alt_count_)
-	{
-	  String repstr = to_string (rep_count_ - alt_count_ + done_count_) + ".";
-	  if (done_count_ > 1)
-	    {
-	      add_repeat_command (scm_list_n (ly_symbol2scm ("volta"), SCM_BOOL_F, SCM_UNDEFINED));
-
-	      if (done_count_ - 1 < alt_count_)
-		add_repeat_command (ly_symbol2scm ("end-repeat"));
-	    }
-
-	  if (done_count_ == 1 && alt_count_ < rep_count_)
-	    {
-	      repstr = "1.--" + to_string (rep_count_ - alt_count_ + done_count_) + ".";
-	    }
-
-	  if (done_count_ <= alt_count_)
-	    add_repeat_command (scm_list_n (ly_symbol2scm ("volta"),
-					    scm_makfrom0str (repstr.to_str0 ()), SCM_UNDEFINED));
-	}
-      else
-	{
-	  add_repeat_command (ly_symbol2scm ("end-repeat"));
-	}
-    }
-}
-
-void
-Volta_repeat_iterator::process (Moment m)
-{
-  if (first_time_)
-    {
-      add_repeat_command (ly_symbol2scm ("start-repeat"));
-      first_time_ = false;
-    }
-  Sequential_iterator::process (m);
-}
-
-IMPLEMENT_CTOR_CALLBACK (Volta_repeat_iterator);
 IMPLEMENT_CTOR_CALLBACK (Unfolded_repeat_iterator);