X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpercent-repeat-iterator.cc;h=3c8420daa0d7a16d714e1a38c0f8c0ae38eed668;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=29021ee3964e7350a982f2b910b266ed37605281;hpb=70d5609d63efe8a9b42ff763b79348bf99953bf2;p=lilypond.git

diff --git a/lily/percent-repeat-iterator.cc b/lily/percent-repeat-iterator.cc
index 29021ee396..3c8420daa0 100644
--- a/lily/percent-repeat-iterator.cc
+++ b/lily/percent-repeat-iterator.cc
@@ -1,52 +1,73 @@
 /*
-  percent-repeat-iterator.cc -- implement Percent_repeat_iterator
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2001--2015  Han-Wen Nienhuys <hanwen@xs4all.nl>
+                  Erik Sandberg <mandolaerik@gmail.com>
 
-  (c) 2001--2006  Han-Wen Nienhuys <hanwen@xs4all.nl>, Erik Sandberg <mandolaerik@gmail.com>
-*/
+  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.
 
-#include "percent-repeat-iterator.hh"
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
+#include "context.hh"
 #include "input.hh"
-#include "international.hh"
-#include "music.hh"
 #include "repeated-music.hh"
+#include "sequential-iterator.hh"
+#include "lily-imports.hh"
+
+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;
+  virtual void construct_children ();
+  virtual void next_element (bool);
+  virtual void derived_mark () const;
+private:
+  SCM child_list_;
+  int starting_bar_;
+};
 
 IMPLEMENT_CTOR_CALLBACK (Percent_repeat_iterator);
 
 Percent_repeat_iterator::Percent_repeat_iterator ()
+  : child_list_ (SCM_UNDEFINED), starting_bar_ (-1)
 {
-  child_list_ = SCM_EOL;
+}
+
+void
+Percent_repeat_iterator::derived_mark () const
+{
+  scm_gc_mark (child_list_);
+  Sequential_iterator::derived_mark ();
 }
 
 void
 Percent_repeat_iterator::construct_children ()
 {
-  /* TODO: Distinction between percent and slash */
   Music *mus = get_music ();
+
   Music *child = Repeated_music::body (mus);
-  SCM length = child->get_length ().smobbed_copy ();
-  child_list_ = SCM_EOL;
+  child_list_ = scm_list_1 (child->self_scm ());
 
-  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 - 1));
-    Music *percent_chord = make_music_by_name (ly_symbol2scm ("EventChord"));
-    percent_chord->set_spot (*mus->origin ());
-    percent_chord->set_property ("elements", scm_list_1 (percent->self_scm ()));
-    child_list_ = scm_cons (percent_chord->self_scm (), child_list_);
-    percent->unprotect ();
-    percent_chord->unprotect ();
-  }
-  child_list_ = scm_cons (child->self_scm (), child_list_);
-  
   Sequential_iterator::construct_children ();
+
+  descend_to_bottom_context ();
+  if (!measure_position (get_outlet ()).main_part_)
+    starting_bar_ =
+      robust_scm2int (get_outlet ()->get_property ("internalBarNumber"), 0);
 }
 
 SCM
@@ -55,9 +76,63 @@ Percent_repeat_iterator::get_music_list () const
   return child_list_;
 }
 
+// Arrive here when child processing has been completed.  At that
+// point of time, we can determine what kind of percent expression we
+// are dealing with and extend the child list just in time before the
+// next iterator is getting fetched.
 void
-Percent_repeat_iterator::derived_mark () const
+Percent_repeat_iterator::next_element (bool side_effect)
 {
-  scm_gc_mark (child_list_);
-  Sequential_iterator::derived_mark ();
+  // Do nothing if we already did our processing here.
+  if (!scm_is_pair (child_list_))
+    {
+      Sequential_iterator::next_element (side_effect);
+      return;
+    }
+
+  Music *mus = get_music ();
+
+  Music *child = Repeated_music::body (mus);
+  SCM length = child->get_length ().smobbed_copy ();
+
+  int current_bar = -1;
+  if (!measure_position (get_outlet ()).main_part_)
+    current_bar =
+      robust_scm2int (get_outlet ()->get_property ("internalBarNumber"), 0);
+
+  SCM child_list = SCM_EOL;
+
+  string event_type;
+  SCM slash_count = SCM_EOL;
+
+  if (starting_bar_ >= 0 && current_bar == starting_bar_ + 1)
+    event_type = "PercentEvent";
+  else if (starting_bar_ >=0 && current_bar == starting_bar_ + 2)
+    event_type = "DoublePercentEvent";
+  else
+    {
+      slash_count = Lily::calc_repeat_slash_count (child->self_scm ());
+      event_type = "RepeatSlashEvent";
+    }
+
+  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);
+        }
+
+      child_list = scm_cons (percent->unprotect (), child_list);
+    }
+
+  scm_set_cdr_x (child_list_, child_list);
+  child_list_ = SCM_EOL;
+
+  Sequential_iterator::next_element (side_effect);
 }