X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspan-arpeggio-engraver.cc;h=c192d0a456408501f19eb5029e9f215999902948;hb=7e72a1e50e94a7f9738d62599de79fe7745f600c;hp=0753b2c245119cd06333e5b918f9348fd54a4f0e;hpb=2804f8f79e01dc606ce067bffda2d966524e6e36;p=lilypond.git diff --git a/lily/span-arpeggio-engraver.cc b/lily/span-arpeggio-engraver.cc index 0753b2c245..c192d0a456 100644 --- a/lily/span-arpeggio-engraver.cc +++ b/lily/span-arpeggio-engraver.cc @@ -3,7 +3,9 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2002 Jan Nieuwenhuizen + (c) 2000--2004 Jan Nieuwenhuizen + + Han-Wen Nienhuys */ #include "engraver.hh" @@ -26,7 +28,7 @@ public: protected: virtual void acknowledge_grob (Grob_info); - virtual void create_grobs (); + virtual void process_acknowledged_grobs (); virtual void stop_translation_timestep (); private: @@ -43,28 +45,27 @@ Span_arpeggio_engraver::Span_arpeggio_engraver () void Span_arpeggio_engraver::acknowledge_grob (Grob_info info) { - if (info.origin_trans_l_arr (this).size () - && Arpeggio::has_interface (info.grob_l_)) + if (info.origin_transes (this).size () + && Arpeggio::has_interface (info.grob_)) { - arpeggios_.push (info.grob_l_); + arpeggios_.push (info.grob_); } } void -Span_arpeggio_engraver::create_grobs () +Span_arpeggio_engraver::process_acknowledged_grobs () { /* - connectArpeggios is slightly brusque; we should really read a elt + connectArpeggios is slightly brusque; we should really read a grob property of the caught non-span arpeggios. That way, we can have both non-connected and connected arps in one pianostaff. - */ if (!span_arpeggio_ && arpeggios_.size () > 1 && to_boolean (get_property ("connectArpeggios"))) { - span_arpeggio_ = new Item (get_property ("Arpeggio")); + span_arpeggio_ = make_item ("Arpeggio"); announce_grob(span_arpeggio_, SCM_EOL); } } @@ -91,7 +92,7 @@ Span_arpeggio_engraver::stop_translation_timestep () we can't kill the children, since we don't want to the previous note to bump into the span arpeggio; so we make it transparent. */ - arpeggios_[i]->set_grob_property ("molecule-callback", SCM_BOOL_T); + arpeggios_[i]->set_grob_property ("molecule-callback", SCM_EOL); } typeset_grob (span_arpeggio_); @@ -105,6 +106,7 @@ Span_arpeggio_engraver::stop_translation_timestep () ENTER_DESCRIPTION(Span_arpeggio_engraver, /* descr */ "", /* creats*/ "Arpeggio", -/* acks */ "arpeggio-interface", +/* accepts */ "", +/* acks */ "arpeggio-interface", /* reads */ "connectArpeggios", /* write */ "");