X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrace-iterator.cc;h=5d95fef2e79ca14b244fe791af43fac1e5c3497c;hb=cfe204f50a73e31a4fa15091a1f812843ef6c245;hp=fde8167730ed9ea7e9f4d74ee3b4ab20881d6790;hpb=6bf1606d827527f02953add0988a4fbbf0dc0c4e;p=lilypond.git

diff --git a/lily/grace-iterator.cc b/lily/grace-iterator.cc
index fde8167730..5d95fef2e7 100644
--- a/lily/grace-iterator.cc
+++ b/lily/grace-iterator.cc
@@ -1,52 +1,47 @@
-/*   
-  grace-music.cc --  implement Grace_music
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2001 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--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-#include "global-translator.hh"
-#include "warn.hh"
+  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.
 
-Grace_iterator::~Grace_iterator () 
-{
-  //  child_iter_p_ = 0;
-}
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
+#include "grace-iterator.hh"
+#include "global-context.hh"
+#include "warn.hh"
 
 void
 Grace_iterator::process (Moment m)
 {
-  Moment main ;
-  main.main_part_ = music_length_.grace_part_ + m.grace_part_;
+  Moment main;
+  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 ();
+  /* 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_ =  cp.main_part_- music_length_.grace_part_ ;
+  pending.grace_part_ = start_mom_.grace_part_ + cp.main_part_;
 
   return pending;
 }
 
-
 IMPLEMENT_CTOR_CALLBACK (Grace_iterator);