/*
head-grav.cc -- part of GNU LilyPond
- (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include <ctype.h>
#include "rhythmic-head.hh"
#include "paper-def.hh"
-#include "musical-request.hh"
+#include "event.hh"
#include "dots.hh"
#include "dot-column.hh"
#include "staff-symbol-referencer.hh"
/**
make balls and rests
*/
+
class Note_heads_engraver : public Engraver
{
Link_array<Item> notes_;
Link_array<Item> dots_;
- Link_array<Note_req> note_reqs_;
+ Link_array<Music> note_reqs_;
public:
TRANSLATOR_DECLARATIONS(Note_heads_engraver);
protected:
- virtual void start_translation_timestep ();
virtual bool try_music (Music *req) ;
virtual void process_music ();
virtual void stop_translation_timestep ();
-
-private:
- bool in_ligature;
};
Note_heads_engraver::Note_heads_engraver()
{
- in_ligature = 0;
}
bool
Note_heads_engraver::try_music (Music *m)
{
- if (Note_req * n =dynamic_cast <Note_req *> (m))
+ if (m->is_mus_type ("note-event"))
{
- note_reqs_.push (n);
+ note_reqs_.push (m);
return true;
}
- else if (dynamic_cast<Busy_playing_req*> (m))
- {
- return note_reqs_.size ();
- }
- else if (Span_req *req_ = dynamic_cast<Span_req*> (m))
- {
- if (scm_equal_p (req_->get_mus_property ("span-type"),
- ly_str02scm ("abort")) == SCM_BOOL_T)
- {
- in_ligature = 0;
- }
- else if (scm_equal_p (req_->get_mus_property ("span-type"),
- ly_str02scm ("ligature")) == SCM_BOOL_T)
- {
- in_ligature = (req_->get_span_dir () == START);
- }
- }
+ else if (m->is_mus_type ("busy-playing-event"))
+ return note_reqs_.size ();
+ else if (m->is_mus_type ("start-playing-event"))
+ return note_reqs_.size ();
return false;
}
{
for (int i=0; i < note_reqs_.size (); i++)
{
- Item *note =
- new Item (get_property ((in_ligature) ? "LigatureHead" : "NoteHead"));
+ Item *note = make_item ("NoteHead");
Music * req = note_reqs_[i];
if (dur.dot_count ())
{
- Item * d = new Item (get_property ("Dots"));
+ Item * d = make_item ("Dots");
Rhythmic_head::set_dots (note, d);
if (dur.dot_count ()
- != gh_scm2int (d->get_grob_property ("dot-count")))
+ != robust_scm2int (d->get_grob_property ("dot-count"), 0))
d->set_grob_property ("dot-count", gh_int2scm (dur.dot_count ()));
d->set_parent (note, Y_AXIS);
typeset_grob (dots_[i]);
}
dots_.clear ();
-
note_reqs_.clear ();
}
-void
-Note_heads_engraver::start_translation_timestep ()
-{
-}
ENTER_DESCRIPTION(Note_heads_engraver,
-/* descr */ "Generate one or more noteheads from Music of type Note_req.",
+/* descr */ "Generate noteheads.",
/* creats*/ "NoteHead Dots",
-/* acks */ "",
+/* accepts */ "note-event busy-playing-event ligature-event abort-event",
+/* acks */ "",
/* reads */ "centralCPosition",
/* write */ "");