release: 1.5.4

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

diff --git a/lily/grace-iterator.cc b/lily/grace-iterator.cc
index 9248e071f8c218301669fb6cf144ff90baa2f37a..fde8167730ed9ea7e9f4d74ee3b4ab20881d6790 100644 (file)
--- a/lily/grace-iterator.cc
+++ b/lily/grace-iterator.cc
@@ -22,10 +22,10 @@ Grace_iterator::~Grace_iterator ()
 
 
 void
-Grace_iterator::process (Moment m )
+Grace_iterator::process (Moment m)
 {
   Moment main ;
-  main.main_part_ = m.grace_mom_;
+  main.main_part_ = music_length_.grace_part_ + m.grace_part_;
   Music_wrapper_iterator::process (main);
 }
 
@@ -43,7 +43,7 @@ Grace_iterator::pending_moment () const
   Moment cp =Music_wrapper_iterator::pending_moment();
 
   Moment pending;
-  pending.grace_mom_ = - music_length_.main_part_  + cp.main_part_;
+  pending.grace_part_ =  cp.main_part_- music_length_.grace_part_ ;
 
   return pending;
 }