-/*
- percent-repeat-iterator.cc -- implement Percent_repeat_iterator
-
- source file of the GNU LilyPond music typesetter
-
- (c) 2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-
- */
+/*
+ percent-repeat-iterator.cc -- implement Percent_repeat_iterator
-#include "percent-repeat-iterator.hh"
-#include "repeated-music.hh"
-#include "input.hh"
+ source file of the GNU LilyPond music typesetter
-IMPLEMENT_CTOR_CALLBACK (Percent_repeat_iterator);
+ (c) 2001--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Erik Sandberg <mandolaerik@gmail.com>
+*/
+#include "input.hh"
+#include "repeated-music.hh"
+#include "sequential-iterator.hh"
-Percent_repeat_iterator::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;
+};
-Percent_repeat_iterator::Percent_repeat_iterator (Percent_repeat_iterator const & p)
- : Music_iterator (p)
-{
- child_iter_p_ = p.child_iter_p_ ? p.child_iter_p_->clone (): 0;
- finish_mom_ = p.finish_mom_ ;
-}
+IMPLEMENT_CTOR_CALLBACK (Percent_repeat_iterator);
-bool
-Percent_repeat_iterator::ok () const
+Percent_repeat_iterator::Percent_repeat_iterator ()
{
- return child_iter_p_;
}
-void
-Percent_repeat_iterator::construct_children ()
+SCM
+Percent_repeat_iterator::get_music_list () const
{
- Repeated_music * mus =dynamic_cast<Repeated_music *> (music_l_);
- finish_mom_ = mus->length_mom ();
- child_iter_p_ = get_iterator_p (mus->body ());
-}
-
+ /* 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::process (Moment m)
-{
- if (!m)
- {
- Music_iterator *yeah = try_music (music_l_);
- if (yeah)
- set_translator (yeah->report_to_l ());
- else
- music_l_->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_p_->ok ())
- child_iter_p_->process (m);
-
- if (finish_mom_ <= m )
- {
- delete child_iter_p_;
- child_iter_p_ = 0;
- }
-}
+ child_list = scm_cons (child->self_scm (), child_list);
-Moment
-Percent_repeat_iterator::pending_moment ()const
-{
- if (child_iter_p_->ok ())
- return child_iter_p_->pending_moment ();
- else
- return finish_mom_ ;
-}
-
-Music_iterator*
-Percent_repeat_iterator::try_music_in_children (Music *m) const
-{
- return child_iter_p_->try_music (m);
-}
-
-
-Percent_repeat_iterator::~Percent_repeat_iterator ()
-{
- delete child_iter_p_;
+ return child_list;
}