source file of the GNU LilyPond music typesetter
- (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "engraver.hh"
-#include "dots.hh"
-#include "pointer-group-interface.hh"
#include "axis-group-interface.hh"
#include "context.hh"
-#include "note-head.hh"
+#include "dots.hh"
#include "item.hh"
-#include "side-position-interface.hh"
+#include "note-head.hh"
#include "pitch.hh"
+#include "pointer-group-interface.hh"
+#include "side-position-interface.hh"
+#include "stream-event.hh"
#include "warn.hh"
class Pitched_trill_engraver : public Engraver
DECLARE_ACKNOWLEDGER (dots);
DECLARE_ACKNOWLEDGER (text_spanner);
void process_music ();
- virtual bool try_music (Music *);
void stop_translation_timestep ();
private:
Item *trill_group_;
Item *trill_accidental_;
- Link_array<Grob> heads_;
+ vector<Grob*> heads_;
- void make_trill (Music *);
+ void make_trill (Stream_event *);
};
Pitched_trill_engraver::Pitched_trill_engraver ()
void
Pitched_trill_engraver::acknowledge_dots (Grob_info info)
{
- heads_.push (info.grob ());
+ heads_.push_back (info.grob ());
}
void
Pitched_trill_engraver::acknowledge_note_head (Grob_info info)
{
- heads_.push (info.grob ());
+ heads_.push_back (info.grob ());
}
void
Pitched_trill_engraver::acknowledge_text_spanner (Grob_info info)
{
- Music *mus = info.music_cause ();
- if (mus
- && mus->is_mus_type ("trill-span-event")
- && to_dir (mus->get_property ("span-direction")) == START
- && unsmob_pitch (mus->get_property ("trill-pitch")))
- make_trill (mus);
+ Stream_event *ev = info.event_cause ();
+ if (ev
+ && ev->in_event_class ("trill-span-event")
+ && to_dir (ev->get_property ("span-direction")) == START
+ && unsmob_pitch (ev->get_property ("pitch")))
+ make_trill (ev);
}
void
-Pitched_trill_engraver::make_trill (Music *mus)
+Pitched_trill_engraver::make_trill (Stream_event *ev)
{
- SCM scm_pitch = mus->get_property ("trill-pitch");
+ SCM scm_pitch = ev->get_property ("pitch");
Pitch *p = unsmob_pitch (scm_pitch);
SCM keysig = get_property ("localKeySignature");
SCM handle = scm_assoc (key, keysig);
bool print_acc
- = (handle == SCM_BOOL_F)
- || p->get_alteration () == 0;
+ = (handle == SCM_BOOL_F) || p->get_alteration () == Rational (0);
if (trill_head_)
{
trill_head_ = 0;
}
- trill_head_ = make_item ("TrillPitchHead", mus->self_scm ());
+ trill_head_ = make_item ("TrillPitchHead", ev->self_scm ());
SCM c0scm = get_property ("middleCPosition");
int c0 = scm_is_number (c0scm) ? scm_to_int (c0scm) : 0;
scm_from_int (unsmob_pitch (scm_pitch)->steps ()
+ c0));
- trill_group_ = make_item ("TrillPitchGroup", mus->self_scm ());
+ trill_group_ = make_item ("TrillPitchGroup", ev->self_scm ());
+ trill_group_->set_parent (trill_head_, Y_AXIS);
Axis_group_interface::add_element (trill_group_, trill_head_);
if (print_acc)
{
- trill_accidental_ = make_item ("TrillPitchAccidental", mus->self_scm ());
+ trill_accidental_ = make_item ("TrillPitchAccidental", ev->self_scm ());
// fixme: naming -> alterations
- trill_accidental_->set_property ("accidentals", scm_list_1 (scm_from_int (p->get_alteration ())));
+ trill_accidental_->set_property ("accidentals", scm_list_1 (scm_from_int (Rational (4)
+ * p->get_alteration ())));
Side_position_interface::add_support (trill_accidental_, trill_head_);
+
trill_head_->set_object ("accidental-grob", trill_accidental_->self_scm ());
- trill_group_->set_parent (trill_head_, Y_AXIS);
- Axis_group_interface::add_element (trill_group_, trill_accidental_);
trill_accidental_->set_parent (trill_head_, Y_AXIS);
+ Axis_group_interface::add_element (trill_group_, trill_accidental_);
}
}
Pitched_trill_engraver::stop_translation_timestep ()
{
if (trill_group_)
- for (int i = 0; i < heads_.size (); i++)
+ for (vsize i = 0; i < heads_.size (); i++)
Side_position_interface::add_support (trill_group_, heads_[i]);
heads_.clear ();
{
}
-bool
-Pitched_trill_engraver::try_music (Music *)
-{
- return false;
-}
#include "translator.icc"
+
ADD_ACKNOWLEDGER (Pitched_trill_engraver, note_head);
ADD_ACKNOWLEDGER (Pitched_trill_engraver, dots);
ADD_ACKNOWLEDGER (Pitched_trill_engraver, text_spanner);
+
ADD_TRANSLATOR (Pitched_trill_engraver,
- /* doc */ "Print the bracketed notehead after a notehead with trill.",
- /* create */ "TrillPitchHead TrillPitchAccidental TrillPitchGroup",
- /* accept */ "",
+ /* doc */
+ "Print the bracketed notehead after a notehead with trill.",
+
+ /* create */
+ "TrillPitchHead "
+ "TrillPitchAccidental "
+ "TrillPitchGroup ",
+
/* read */ "",
+
/* write */ "");