source file of the GNU LilyPond music typesetter
- (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
-#include "grace-music.hh"
#include "grace-iterator.hh"
-
-
-#include "global-translator.hh"
+#include "global-context.hh"
#include "warn.hh"
-
-Grace_iterator::~Grace_iterator ()
-{
- // child_iter_p_ = 0;
-}
-
-
void
-Grace_iterator::process (Moment m )
+Grace_iterator::process (Moment m)
{
- Moment main ;
- main.main_part_ = m.grace_mom_;
+ 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_mom_ = - music_length_.main_part_ + cp.main_part_;
+ pending.grace_part_ = start_mom_.grace_part_ + cp.main_part_;
return pending;
}