X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrace-iterator.cc;h=237ebc81eeecb9b69b4cf697af1d8c224d6b63f1;hb=6b876e65197de4fcc073ebc19a5ef744db92c1c9;hp=1482caafe23959e89024c67071c6954e7763204a;hpb=e24df7c27635dc996c466295eacf2981bddccaf7;p=lilypond.git diff --git a/lily/grace-iterator.cc b/lily/grace-iterator.cc index 1482caafe2..237ebc81ee 100644 --- a/lily/grace-iterator.cc +++ b/lily/grace-iterator.cc @@ -1,11 +1,10 @@ -/* - grace-music.cc -- implement Grace_music - +/* + grace-music.cc -- implement Grace_music + source file of the GNU LilyPond music typesetter - - (c) 1999--2005 Han-Wen Nienhuys - - */ + + (c) 1999--2007 Han-Wen Nienhuys +*/ #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);