X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob-pq-engraver.cc;h=6ad7ccf0fa89f9f913b38f04f6bfdb7c538a6657;hb=32a34dcef0c0041c6d62677487a380b5c8b85712;hp=57ba04f9c946c8a9cd0760cb794889b8aba11273;hpb=f41973ff763d5972a85995b6d40c864281ec6714;p=lilypond.git diff --git a/lily/grob-pq-engraver.cc b/lily/grob-pq-engraver.cc index 57ba04f9c9..6ad7ccf0fa 100644 --- a/lily/grob-pq-engraver.cc +++ b/lily/grob-pq-engraver.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2001--2011 Han-Wen Nienhuys + Copyright (C) 2001--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 @@ -29,7 +29,7 @@ struct Grob_pq_entry }; bool -operator< (Grob_pq_entry const &a, Grob_pq_entry const &b) +operator < (Grob_pq_entry const &a, Grob_pq_entry const &b) { return a.end_ < b.end_; } @@ -44,7 +44,7 @@ protected: void start_translation_timestep (); void stop_translation_timestep (); void process_acknowledged (); - + vector started_now_; }; @@ -59,12 +59,12 @@ Grob_pq_engraver::initialize () } LY_DEFINE (ly_grob_pq_less_p, "ly:grob-pqself_scm (), - SCM_EOL); + started_now_[i].grob_->self_scm (), + SCM_EOL); tail = SCM_CDRLOC (*tail); } @@ -136,8 +136,8 @@ Grob_pq_engraver::start_translation_timestep () while (scm_is_pair (busy) && *unsmob_moment (scm_caar (busy)) < now) { /* - The grob-pq-engraver is not water tight, and stuff like - tupletSpannerDuration confuses it. + The grob-pq-engraver is not water tight, and stuff like + tupletSpannerDuration confuses it. */ busy = scm_cdr (busy); } @@ -149,16 +149,16 @@ Grob_pq_engraver::start_translation_timestep () #include "translator.icc" ADD_ACKNOWLEDGER (Grob_pq_engraver, grob); ADD_TRANSLATOR (Grob_pq_engraver, - /* doc */ - "Administrate when certain grobs (e.g., note heads) stop" - " playing.", + /* doc */ + "Administrate when certain grobs (e.g., note heads) stop" + " playing.", - /* create */ - "", + /* create */ + "", - /* read */ - "busyGrobs ", + /* read */ + "busyGrobs ", - /* write */ - "busyGrobs " - ); + /* write */ + "busyGrobs " + );