X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrace-iterator.cc;h=5d95fef2e79ca14b244fe791af43fac1e5c3497c;hb=f5be1aa53d66363cacf2a73534f8f856b02adbb0;hp=daa81375487ee0141b14954bc03301ac3abb69d5;hpb=332da9f4d25f9f63a3222efc87fae06b0c7abbdd;p=lilypond.git diff --git a/lily/grace-iterator.cc b/lily/grace-iterator.cc index daa8137548..5d95fef2e7 100644 --- a/lily/grace-iterator.cc +++ b/lily/grace-iterator.cc @@ -1,15 +1,23 @@ -/* - grace-music.cc -- implement Grace_music - - source file of the GNU LilyPond music typesetter - - (c) 1999--2004 Han-Wen Nienhuys - - */ +/* + This file is part of LilyPond, the GNU music typesetter. -#include "grace-iterator.hh" + Copyright (C) 1999--2012 Han-Wen Nienhuys + + 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. -#include "grace-music.hh" + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . +*/ + +#include "grace-iterator.hh" #include "global-context.hh" #include "warn.hh" @@ -17,7 +25,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 @@ -31,10 +39,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);