X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrace-iterator.cc;h=2ca53ff56137edf91fcc4a1a65169615b0bf8689;hb=refs%2Fheads%2Fdon%2Fdep5_copyright;hp=6668b66f4e9908b48f6c15b7ad9183598129cb01;hpb=d765f3af45be51f15da55cf570a4b172200e1035;p=lilypond.git

diff --git a/lily/grace-iterator.cc b/lily/grace-iterator.cc
index 6668b66f4e..2ca53ff561 100644
--- a/lily/grace-iterator.cc
+++ b/lily/grace-iterator.cc
@@ -1,37 +1,47 @@
-/*   
-  grace-music.cc --  implement Grace_music
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
-
-#include "grace-music.hh"
-#include "grace-iterator.hh"
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 1999--2011 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.
+
+  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 "global-translator.hh"
+#include "grace-iterator.hh"
+#include "global-context.hh"
 #include "warn.hh"
 
 void
 Grace_iterator::process (Moment m)
 {
-  Moment main ;
-  main.main_part_ = - start_mom_.grace_part_ + m.grace_part_;
+  Moment main;
+  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
+     sequential.  */
+  descend_to_child (child_iter_->get_outlet ());
 }
 
 Moment
 Grace_iterator::pending_moment () const
 {
-  Moment cp =Music_wrapper_iterator::pending_moment();
+  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);