* input/test/improv.ly: update: do not use Thread switching.

[lilypond.git] / lily / grace-iterator.cc

diff --git a/lily/grace-iterator.cc b/lily/grace-iterator.cc
index fde8167730ed9ea7e9f4d74ee3b4ab20881d6790..325a0d5207fe45940a4e8165ae57f7142a9ae1af 100644 (file)
--- a/lily/grace-iterator.cc
+++ b/lily/grace-iterator.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -14,36 +14,21 @@
 #include "global-translator.hh"
 #include "warn.hh"
 
-
-Grace_iterator::~Grace_iterator () 
-{
-  //  child_iter_p_ = 0;
-}
-
-
 void
 Grace_iterator::process (Moment m)
 {
   Moment main ;
-  main.main_part_ = music_length_.grace_part_ + m.grace_part_;
+  main.main_part_ = - start_mom_.grace_part_ + m.grace_part_;
   Music_wrapper_iterator::process (main);
 }
 
-void
-Grace_iterator::construct_children ()
-{
-  Music_wrapper_iterator::construct_children ();
-}
-
-
-
 Moment
 Grace_iterator::pending_moment () const
 {
   Moment cp =Music_wrapper_iterator::pending_moment();
 
   Moment pending;
-  pending.grace_part_ =  cp.main_part_- music_length_.grace_part_ ;
+  pending.grace_part_ =  start_mom_.grace_part_ + cp.main_part_;
 
   return pending;
 }