/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2000--2011 Jan Nieuwenhuizen <janneke@gnu.org>
+ Copyright (C) 2000--2015 Jan Nieuwenhuizen <janneke@gnu.org>
Han-Wen Nienhuys <hanwen@xs4all.nl>
#include "engraver.hh"
#include "arpeggio.hh"
+#include "item.hh"
#include "pointer-group-interface.hh"
+#include "separation-item.hh"
#include "side-position-interface.hh"
#include "staff-symbol-referencer.hh"
-#include "item.hh"
+
+#include "translator.icc"
/**
Make arpeggios that span multiple staves. Catch arpeggios, and span a
{
public:
TRANSLATOR_DECLARATIONS (Span_arpeggio_engraver);
- DECLARE_ACKNOWLEDGER (arpeggio);
+ void acknowledge_arpeggio (Grob_info);
+ void acknowledge_note_column (Grob_info);
protected:
void process_acknowledged ();
private:
Item *span_arpeggio_;
vector<Grob *> arpeggios_;
+ vector<Grob *> note_columns_;
};
-Span_arpeggio_engraver::Span_arpeggio_engraver ()
+Span_arpeggio_engraver::Span_arpeggio_engraver (Context *c)
+ : Engraver (c)
{
span_arpeggio_ = 0;
}
arpeggios_.push_back (info.grob ());
}
+void
+Span_arpeggio_engraver::acknowledge_note_column (Grob_info info)
+{
+ note_columns_.push_back (info.grob ());
+}
+
void
Span_arpeggio_engraver::process_acknowledged ()
{
*/
if (!span_arpeggio_ && arpeggios_.size () > 1
&& to_boolean (get_property ("connectArpeggios")))
+ span_arpeggio_ = make_item ("Arpeggio", SCM_EOL);
+
+ if (span_arpeggio_)
{
- span_arpeggio_ = make_item ("Arpeggio", SCM_EOL);
- span_arpeggio_->set_property ("cross-staff", SCM_BOOL_T);
+ for (vsize i = 0; i < note_columns_.size (); i++)
+ Separation_item::add_conditional_item (note_columns_[i], span_arpeggio_);
+ note_columns_.clear ();
}
}
span_arpeggio_ = 0;
}
arpeggios_.clear ();
+ note_columns_.clear ();
}
-#include "translator.icc"
+void
+Span_arpeggio_engraver::boot ()
+{
+ ADD_ACKNOWLEDGER (Span_arpeggio_engraver, arpeggio);
+ ADD_ACKNOWLEDGER (Span_arpeggio_engraver, note_column);
+}
-ADD_ACKNOWLEDGER (Span_arpeggio_engraver, arpeggio);
ADD_TRANSLATOR (Span_arpeggio_engraver,
/* doc */
"Make arpeggios that span multiple staves.",