X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fvolta-repeat-iterator.cc;h=c9ffaf816e68cc83671a44a39a9f101e8ec6c9f5;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=e018fe74b1ca9b09a0e049c689a46ff6e9a5c1ac;hpb=8cab78caa0db1ba14f2e52e4c1ddbb541ea0e5cb;p=lilypond.git

diff --git a/lily/volta-repeat-iterator.cc b/lily/volta-repeat-iterator.cc
index e018fe74b1..c9ffaf816e 100644
--- a/lily/volta-repeat-iterator.cc
+++ b/lily/volta-repeat-iterator.cc
@@ -1,10 +1,20 @@
 /*
-  volta-repeat-iterator.cc -- implement Volta_repeat_iterator
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2002--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
+  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.
 
-  (c) 2002--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  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/>.
 */
 
 #include "music.hh"
@@ -23,24 +33,34 @@ protected:
   virtual void next_element (bool);
   virtual void construct_children ();
   virtual void process (Moment);
+  virtual void derived_mark () const;
 
   bool first_time_;
   int alt_count_;
   int rep_count_;
   int done_count_;
+  SCM alt_restores_;
 };
 
 Volta_repeat_iterator::Volta_repeat_iterator ()
 {
   done_count_ = alt_count_ = rep_count_ = 0;
   first_time_ = true;
+  alt_restores_ = SCM_EOL;
+}
+
+void
+Volta_repeat_iterator::derived_mark () const
+{
+  scm_gc_mark (alt_restores_);
+  Sequential_iterator::derived_mark ();
 }
 
 SCM
 Volta_repeat_iterator::get_music_list ()const
 {
   return scm_cons (get_music ()->get_property ("element"),
-		   get_music ()->get_property ("elements"));
+                   Sequential_iterator::get_music_list ());
 }
 
 void
@@ -50,7 +70,7 @@ Volta_repeat_iterator::construct_children ()
 
   SCM alts = get_music ()->get_property ("elements");
 
-  alt_count_ = scm_ilength (alts);
+  alt_count_ = int (scm_ilength (alts));
   rep_count_ = scm_to_int (get_music ()->get_property ("repeat-count"));
   done_count_ = 0;
 }
@@ -66,7 +86,7 @@ Volta_repeat_iterator::add_repeat_command (SCM what)
   Context *where = get_outlet ()->where_defined (reps, &current_reps);
 
   if (where
-      && current_reps == SCM_EOL || scm_is_pair (current_reps))
+      && (current_reps == SCM_EOL || scm_is_pair (current_reps)))
     {
       current_reps = scm_cons (what, current_reps);
       where->set_property (reps, current_reps);
@@ -83,25 +103,54 @@ Volta_repeat_iterator::next_element (bool side_effect)
   if (side_effect)
     {
       if (alt_count_)
-	{
-	  string repstr = to_string (rep_count_ - alt_count_ + done_count_) + ".";
-	  if (done_count_ > 1)
-	    {
-	      add_repeat_command (scm_list_n (ly_symbol2scm ("volta"), SCM_BOOL_F, SCM_UNDEFINED));
-
-	      if (done_count_ - 1 < alt_count_)
-		add_repeat_command (ly_symbol2scm ("end-repeat"));
-	    }
-
-	  if (done_count_ == 1 && alt_count_ < rep_count_)
-	    repstr = "1.--" + to_string (rep_count_ - alt_count_ + done_count_) + ".";
-
-	  if (done_count_ <= alt_count_)
-	    add_repeat_command (scm_list_n (ly_symbol2scm ("volta"),
-					    ly_string2scm (repstr), SCM_UNDEFINED));
-	}
+        {
+          string repstr = ::to_string (rep_count_ - alt_count_ + done_count_) + ".";
+          if (done_count_ <= 1)
+            {
+              alt_restores_ = SCM_EOL;
+              if (to_boolean (get_outlet ()->get_property ("timing")))
+                {
+                  for (SCM lst = get_outlet ()->get_property ("alternativeRestores");
+                       scm_is_pair (lst);
+                       lst = scm_cdr (lst))
+                    {
+                      SCM res = SCM_EOL;
+                      Context *t = get_outlet ()->where_defined (scm_car (lst),
+                                                                 &res);
+                      if (t)
+                        {
+                          alt_restores_ = scm_cons
+                            (scm_list_3 (t->self_scm (), scm_car (lst), res),
+                             alt_restores_);
+                        }
+                    }
+                }
+            }
+          else
+            {
+
+              add_repeat_command (scm_list_n (ly_symbol2scm ("volta"), SCM_BOOL_F, SCM_UNDEFINED));
+
+              if (done_count_ - 1 < alt_count_)
+                add_repeat_command (ly_symbol2scm ("end-repeat"));
+
+              if (to_boolean (get_outlet ()->get_property ("timing")))
+                {
+                  for (SCM p = alt_restores_; scm_is_pair (p); p = scm_cdr (p))
+                    scm_apply_0 (ly_lily_module_constant ("ly:context-set-property!"),
+                                 scm_car (p));
+                }
+            }
+
+          if (done_count_ == 1 && alt_count_ < rep_count_)
+            repstr = "1.--" + ::to_string (rep_count_ - alt_count_ + done_count_) + ".";
+
+          if (done_count_ <= alt_count_)
+            add_repeat_command (scm_list_n (ly_symbol2scm ("volta"),
+                                            ly_string2scm (repstr), SCM_UNDEFINED));
+        }
       else
-	add_repeat_command (ly_symbol2scm ("end-repeat"));
+        add_repeat_command (ly_symbol2scm ("end-repeat"));
     }
 }