X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrace-iterator.cc;h=1974f0d801722c71bc13c0752f9ca5b08343f514;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=17ba7bd187f12ec5215c77ec8c39b1bb7056f07a;hpb=c659cb200486c2f908703696a1b2873e78c8160a;p=lilypond.git diff --git a/lily/grace-iterator.cc b/lily/grace-iterator.cc index 17ba7bd187..1974f0d801 100644 --- a/lily/grace-iterator.cc +++ b/lily/grace-iterator.cc @@ -1,15 +1,12 @@ -/* - grace-music.cc -- implement Grace_music - +/* + grace-music.cc -- implement Grace_music + source file of the GNU LilyPond music typesetter - - (c) 1999--2004 Han-Wen Nienhuys - - */ -#include "grace-iterator.hh" + (c) 1999--2008 Han-Wen Nienhuys +*/ -#include "grace-music.hh" +#include "grace-iterator.hh" #include "global-context.hh" #include "warn.hh" @@ -17,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 @@ -28,13 +25,12 @@ Grace_iterator::process (Moment m) 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);