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

diff --git a/lily/unfolded-repeat-iterator.cc b/lily/unfolded-repeat-iterator.cc
index fac94cece6..976861fa8b 100644
--- a/lily/unfolded-repeat-iterator.cc
+++ b/lily/unfolded-repeat-iterator.cc
@@ -1,174 +1,63 @@
-/*   
-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--2015 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--2003 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"
 #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;
 };
 
-
 SCM
 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 = scm_to_int (get_music ()->get_property ("repeat-count"));
 
   for (int i = 0; i < rep_count; i++)
     {
-      if (unsmob_music (body))
-	*tail = gh_cons (body, SCM_EOL) ;
+      if (Music::is_smob (body))
+        *tail = scm_cons (body, SCM_EOL);
 
       tail = SCM_CDRLOC (*tail);
 
       if (alt_count)
-	{
-	  *tail = gh_cons (gh_car (alts), SCM_EOL);
-	  tail = SCM_CDRLOC (*tail);
-	  if (i >= rep_count - alt_count)
-	    
-	    alts = gh_cdr (alts);
-	}      
-    }
+        {
+          *tail = scm_cons (scm_car (alts), SCM_EOL);
+          tail = SCM_CDRLOC (*tail);
+          if (i >= rep_count - alt_count)
 
-  return l; 
-}
-
-class Volta_repeat_iterator : public Sequential_iterator
-{
-public:
-  DECLARE_SCHEME_CALLBACK(constructor, ());
-  VIRTUAL_COPY_CONS (Music_iterator);
-  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 gh_cons (get_music ()->get_mus_property ("element"),
-		  get_music ()->get_mus_property ("elements"));
-}
-
-void
-Volta_repeat_iterator::construct_children ()
-{
-  Sequential_iterator::construct_children();
-  
-  SCM alts = get_music ()->get_mus_property ("elements");
-
-  alt_count_ = scm_ilength (alts);
-  rep_count_ = gh_scm2int (get_music ()->get_mus_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);
-
-  Translator_group * where = get_outlet ()->where_defined (reps);
-  if (where
-      && current_reps == SCM_EOL || gh_pair_p (current_reps))
-    {
-      current_reps = gh_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"));
-	}
+            alts = scm_cdr (alts);
+        }
     }
-}
-
 
-void
-Volta_repeat_iterator::process (Moment m)
-{
-  if (first_time_)
-    {
-      add_repeat_command (ly_symbol2scm ("start-repeat"));
-      first_time_ = false;
-    }
-  Sequential_iterator::process(m);
+  return l;
 }
 
-
-IMPLEMENT_CTOR_CALLBACK(Volta_repeat_iterator);
-IMPLEMENT_CTOR_CALLBACK(Unfolded_repeat_iterator);
+IMPLEMENT_CTOR_CALLBACK (Unfolded_repeat_iterator);