Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond

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

diff --git a/lily/grace-iterator.cc b/lily/grace-iterator.cc
index 8ef15c7cf98f0fb1c9cef0de9fd3255751404f46..237ebc81eeecb9b69b4cf697af1d8c224d6b63f1 100644 (file)
--- a/lily/grace-iterator.cc
+++ b/lily/grace-iterator.cc
@@ -1,11 +1,10 @@
-/*   
+/*
   grace-music.cc -- implement Grace_music
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1999--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #include "grace-iterator.hh"
 #include "global-context.hh"
@@ -15,7 +14,7 @@ void
 Grace_iterator::process (Moment m)
 {
   Moment main;
-  main.main_part_ = - start_mom_.grace_part_ + m.grace_part_;
+  main.main_part_ = -start_mom_.grace_part_ + m.grace_part_;
   Music_wrapper_iterator::process (main);
 
   /* We can safely do this, since \grace should always be inside
@@ -29,10 +28,9 @@ Grace_iterator::pending_moment () const
   Moment cp = Music_wrapper_iterator::pending_moment ();
 
   Moment pending;
-  pending.grace_part_ =  start_mom_.grace_part_ + cp.main_part_;
+  pending.grace_part_ = start_mom_.grace_part_ + cp.main_part_;
 
   return pending;
 }
 
-
 IMPLEMENT_CTOR_CALLBACK (Grace_iterator);