X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpercent-repeat-iterator.cc;h=5573dc7609b988b99667b51b3304cb78169b70e3;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=86a1d3379583706f9d33eb3070515061c6336ce4;hpb=5758fa63add68276fd012fac73a240f40332a320;p=lilypond.git

diff --git a/lily/percent-repeat-iterator.cc b/lily/percent-repeat-iterator.cc
index 86a1d33795..5573dc7609 100644
--- a/lily/percent-repeat-iterator.cc
+++ b/lily/percent-repeat-iterator.cc
@@ -1,93 +1,54 @@
-/*   
-  percent-repeat-iterator.cc --  implement Percent_repeat_iterator
-  
+/*
+  percent-repeat-iterator.cc -- implement Percent_repeat_iterator
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2001--2004  Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
 
-#include "percent-repeat-iterator.hh"
-#include "repeated-music.hh"
+  (c) 2001--2008  Han-Wen Nienhuys <hanwen@xs4all.nl>
+                  Erik Sandberg <mandolaerik@gmail.com>
+*/
+
 #include "input.hh"
+#include "repeated-music.hh"
+#include "sequential-iterator.hh"
 
-IMPLEMENT_CTOR_CALLBACK (Percent_repeat_iterator);
+class Percent_repeat_iterator : public Sequential_iterator
+{
+public:
+  DECLARE_CLASSNAME (Percent_repeat_iterator);
+  DECLARE_SCHEME_CALLBACK (constructor, ());
+  Percent_repeat_iterator ();
+protected:
+  virtual SCM get_music_list () const;
+};
 
+IMPLEMENT_CTOR_CALLBACK (Percent_repeat_iterator);
 
 Percent_repeat_iterator::Percent_repeat_iterator ()
 {
-  child_iter_ = 0;
-}
-
-void
-Percent_repeat_iterator::do_quit ()
-{
-  if (child_iter_)
-    child_iter_->quit ();
 }
 
-bool
-Percent_repeat_iterator::ok () const
+SCM
+Percent_repeat_iterator::get_music_list () const
 {
-  return child_iter_;
-}
+  /* TODO: Distinction between percent, double-percent and slash */
+  Music *mus = get_music ();
+  Music *child = Repeated_music::body (mus);
+  SCM length = child->get_length ().smobbed_copy ();
+  SCM child_list = SCM_EOL;
 
-void
-Percent_repeat_iterator::construct_children ()
-{
-  Repeated_music * mus =dynamic_cast<Repeated_music *> (get_music ());
-  finish_mom_ = mus->get_length ();
-  child_iter_ = unsmob_iterator (get_iterator (mus->body ()));
-}
-
-
-void
-Percent_repeat_iterator::process (Moment m)
-{
-  if (!m.to_bool ())
-    {
-      Music_iterator *yeah = try_music (get_music ());
-      if (yeah)
-	set_context (yeah->get_outlet ());
-      else
-	get_music ()->origin ()->warning ( _ ("no one to print a percent"));
-    }
+  int repeats = scm_to_int (mus->get_property ("repeat-count"));
+  for (int i = repeats; i > 1; i--)
+  {
+    Music *percent = make_music_by_name (ly_symbol2scm ("PercentEvent"));
+    percent->set_spot (*mus->origin ());
+    percent->set_property ("length", length);
+    if (repeats > 1)
+      percent->set_property ("repeat-count", scm_int2num (i));
+    
+    child_list = scm_cons (percent->unprotect (), child_list);
+  }
   
-  if (child_iter_->ok ())
-    child_iter_->process (m);
-
-  if (finish_mom_ <= m )
-    {
-      child_iter_->quit (); 
-      child_iter_ = 0;
-    }
-}
-
-Moment
-Percent_repeat_iterator::pending_moment ()const
-{
-  if (child_iter_->ok ())
-    return child_iter_->pending_moment ();
-  else
-    return finish_mom_ ;
-}
+  child_list = scm_cons (child->self_scm (), child_list);
 
-Music_iterator*
-Percent_repeat_iterator::try_music_in_children (Music *m) const
-{
-  return child_iter_->try_music (m);
-}
-
-void
-Percent_repeat_iterator::derived_mark ()const
-{
-  if (child_iter_)
-    scm_gc_mark (child_iter_->self_scm ());
-}
-
-void
-Percent_repeat_iterator::derived_substitute (Context *f,Context *t )
-{
-  if (child_iter_)
-    child_iter_->substitute_outlet (f,t);
+  return child_list;
 }