/*
- head-grav.cc -- part of GNU LilyPond
+ note-heads-engraver.cc -- part of GNU LilyPond
- (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2004 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"
#include "engraver.hh"
#include "warn.hh"
-/**
- make balls and rests
- */
class Note_heads_engraver : public Engraver
{
Link_array<Item> notes_;
-
Link_array<Item> dots_;
Link_array<Music> note_reqs_;
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
}
else if (m->is_mus_type ("busy-playing-event"))
return note_reqs_.size ();
- else if (m->is_mus_type ("abort-event"))
- {
- in_ligature = 0;
- }
- else if (m->is_mus_type ("ligature-event"))
- {
- /*
- Urg ; this is not protocol. We should accept and return
- true, or ignore.
- */
- in_ligature = (m->get_mus_property("span-direction")
- == gh_int2scm (START));
- }
+ 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];
Duration dur = *unsmob_duration (req->get_mus_property ("duration"));
note->set_grob_property ("duration-log", gh_int2scm (dur.duration_log ()));
-
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);
Pitch *pit =unsmob_pitch (req->get_mus_property ("pitch"));
- int pos = pit->steps ();
+ int pos = pit ? pit->steps () : 0;
SCM c0 = get_property ("centralCPosition");
if (gh_number_p (c0))
pos += gh_scm2int (c0);
note_reqs_.clear ();
}
-void
-Note_heads_engraver::start_translation_timestep ()
-{
-}
ENTER_DESCRIPTION(Note_heads_engraver,
-/* descr */ "Generate noteheads (also serves a double functions: makes ligatures.",
-/* creats*/ "NoteHead LigatureHead Dots",
-/* accepts */ "note-event busy-playing-event ligature-event abort-event",
+/* descr */ "Generate noteheads.",
+/* creats*/ "NoteHead Dots",
+/* accepts */ "note-event busy-playing-event",
/* acks */ "",
/* reads */ "centralCPosition",
/* write */ "");