X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpercent-repeat-iterator.cc;h=9d64e6556153ee476e988b40bf054cd22a45dbdb;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=25e1b0fbb37ecc2af28044136e643186e6a6a378;hpb=5d1ddaf889233f8e5c32a118f9e843e1becca2d2;p=lilypond.git

diff --git a/lily/percent-repeat-iterator.cc b/lily/percent-repeat-iterator.cc
index 25e1b0fbb3..9d64e65561 100644
--- a/lily/percent-repeat-iterator.cc
+++ b/lily/percent-repeat-iterator.cc
@@ -1,94 +1,87 @@
-/*   
-  percent-repeat-iterator.cc --  implement Percent_repeat_iterator
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 2001--2005  Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
 
-#include "percent-repeat-iterator.hh"
+  Copyright (C) 2001--2015  Han-Wen Nienhuys <hanwen@xs4all.nl>
+                  Erik Sandberg <mandolaerik@gmail.com>
 
-#include "repeated-music.hh"
-#include "input.hh"
+  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.
 
-IMPLEMENT_CTOR_CALLBACK (Percent_repeat_iterator);
+  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/>.
+*/
 
-Percent_repeat_iterator::Percent_repeat_iterator ()
-{
-  child_iter_ = 0;
-}
+#include "context.hh"
+#include "input.hh"
+#include "repeated-music.hh"
+#include "sequential-iterator.hh"
 
-void
-Percent_repeat_iterator::do_quit ()
+class Percent_repeat_iterator : public Sequential_iterator
 {
-  if (child_iter_)
-    child_iter_->quit ();
-}
+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);
 
-bool
-Percent_repeat_iterator::ok () const
+Percent_repeat_iterator::Percent_repeat_iterator ()
 {
-  return child_iter_;
 }
 
-void
-Percent_repeat_iterator::construct_children ()
+SCM
+Percent_repeat_iterator::get_music_list () const
 {
   Music *mus = get_music ();
-  finish_mom_ = mus->get_length ();
-  child_iter_ = unsmob_iterator (get_iterator (Repeated_music::body (mus)));
-}
 
+  Music *child = Repeated_music::body (mus);
+  SCM length = child->get_length ().smobbed_copy ();
+  SCM child_list = SCM_EOL;
+  Moment measure_len = measure_length (get_outlet ());
+  Moment music_len = robust_scm2moment (length, Moment (0));
 
-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"));
-    }
-  
-  if (child_iter_->ok ())
-    child_iter_->process (m);
+  string event_type;
+  SCM slash_count = SCM_EOL;
 
-  if (finish_mom_ <= m )
+  if (measure_len == music_len)
+    event_type = "PercentEvent";
+  else if (measure_len * Moment (2) == music_len)
+    event_type = "DoublePercentEvent";
+  else
     {
-      child_iter_->quit (); 
-      child_iter_ = 0;
+      slash_count
+        = scm_call_1 (ly_lily_module_constant ("calc-repeat-slash-count"),
+                      child->self_scm ());
+      event_type = "RepeatSlashEvent";
     }
-}
 
-Moment
-Percent_repeat_iterator::pending_moment ()const
-{
-  if (child_iter_->ok ())
-    return child_iter_->pending_moment ();
-  else
-    return finish_mom_ ;
-}
+  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 (event_type.c_str ()));
+      percent->set_spot (*mus->origin ());
+      percent->set_property ("length", length);
+      if (repeats > 1)
+        {
+          percent->set_property ("repeat-count", scm_from_int (i));
+          if (event_type == "RepeatSlashEvent")
+            percent->set_property ("slash-count", slash_count);
+        }
 
-Music_iterator*
-Percent_repeat_iterator::try_music_in_children (Music *m) const
-{
-  return child_iter_->try_music (m);
-}
+      child_list = scm_cons (percent->unprotect (), child_list);
+    }
 
-void
-Percent_repeat_iterator::derived_mark ()const
-{
-  if (child_iter_)
-    scm_gc_mark (child_iter_->self_scm ());
-}
+  child_list = scm_cons (child->self_scm (), child_list);
 
-void
-Percent_repeat_iterator::derived_substitute (Context *f, Context *t )
-{
-  if (child_iter_)
-    child_iter_->substitute_outlet (f, t);
+  return child_list;
 }