X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpercent-repeat-iterator.cc;h=845bd729b6150b18df889daea65e3753ce9eb074;hb=7a2766a80beb907df0b291584c1a84b6b4fe4c4f;hp=2329daff5a3dbacad95bb1ab9327a6cbc4b3511a;hpb=573882a49a89b0047570af080dbece7364a020c5;p=lilypond.git

diff --git a/lily/percent-repeat-iterator.cc b/lily/percent-repeat-iterator.cc
index 2329daff5a..845bd729b6 100644
--- a/lily/percent-repeat-iterator.cc
+++ b/lily/percent-repeat-iterator.cc
@@ -1,105 +1,65 @@
-/*   
-  percent-repeat-iterator.cc --  implement Percent_repeat_iterator
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 2001--2003  Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
 
-#include "percent-repeat-iterator.hh"
-#include "repeated-music.hh"
-#include "input.hh"
+  Copyright (C) 2001--2011  Han-Wen Nienhuys <hanwen@xs4all.nl>
+                  Erik Sandberg <mandolaerik@gmail.com>
 
-IMPLEMENT_CTOR_CALLBACK (Percent_repeat_iterator);
+  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.
 
+  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.
 
-Percent_repeat_iterator::Percent_repeat_iterator ()
-{
-  child_iter_ = 0;
-}
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
-void
-Percent_repeat_iterator::do_quit()
-{
-  if (child_iter_)
-    child_iter_->quit();
-}
-Percent_repeat_iterator::Percent_repeat_iterator (Percent_repeat_iterator const & p)
-  : Music_iterator (p)
-{
-  child_iter_ = 0;
- finish_mom_ = p.finish_mom_ ;
- 
-  if (p.child_iter_)
-    {
-      child_iter_ =  p.child_iter_->clone ();
-      scm_gc_unprotect_object (child_iter_->self_scm());
-    }
-}
-
-bool
-Percent_repeat_iterator::ok () const
-{
-  return child_iter_;
-}
+#include "input.hh"
+#include "repeated-music.hh"
+#include "sequential-iterator.hh"
 
-void
-Percent_repeat_iterator::construct_children ()
+class Percent_repeat_iterator : public Sequential_iterator
 {
-  Repeated_music * mus =dynamic_cast<Repeated_music *> (get_music ());
-  finish_mom_ = mus->get_length ();
-  child_iter_ = unsmob_iterator (get_iterator (mus->body ()));
-}
+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);
 
-void
-Percent_repeat_iterator::process (Moment m)
+Percent_repeat_iterator::Percent_repeat_iterator ()
 {
-  if (!m.to_bool ())
-    {
-      Music_iterator *yeah = try_music (get_music ());
-      if (yeah)
-	set_translator (yeah->report_to ());
-      else
-	get_music ()->origin ()->warning ( _ ("no one to print a percent"));
-    }
-  
-  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
+SCM
+Percent_repeat_iterator::get_music_list () const
 {
-  if (child_iter_->ok ())
-    return child_iter_->pending_moment ();
-  else
-    return finish_mom_ ;
-}
+  /* 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;
 
-Music_iterator*
-Percent_repeat_iterator::try_music_in_children (Music *m) const
-{
-  return child_iter_->try_music (m);
-}
+  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_from_int (i));
 
-void
-Percent_repeat_iterator::derived_mark()const
-{
-  if (child_iter_)
-    scm_gc_mark (child_iter_->self_scm());
-}
+    child_list = scm_cons (percent->unprotect (), child_list);
+  }
 
-void
-Percent_repeat_iterator::derived_substitute(Translator_group*f,Translator_group*t )
-{
-  if (child_iter_)
-    child_iter_->substitute_outlet (f,t);
+  child_list = scm_cons (child->self_scm (), child_list);
+
+  return child_list;
 }