/*
note-heads-engraver.cc -- part of GNU LilyPond
- (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
+#include "engraver.hh"
+
#include <cctype>
+using namespace std;
#include "rhythmic-head.hh"
#include "output-def.hh"
#include "dot-column.hh"
#include "staff-symbol-referencer.hh"
#include "item.hh"
-#include "engraver.hh"
#include "warn.hh"
+#include "duration.hh"
class Note_heads_engraver : public Engraver
{
protected:
virtual bool try_music (Music *ev);
- virtual void process_music ();
- virtual void stop_translation_timestep ();
+ void process_music ();
+ void stop_translation_timestep ();
};
Note_heads_engraver::Note_heads_engraver ()
Duration dur = *unsmob_duration (ev->get_property ("duration"));
- note->set_property ("duration-log", scm_int2num (dur.duration_log ()));
+ note->set_property ("duration-log", scm_from_int (dur.duration_log ()));
if (dur.dot_count ())
{
Item *d = make_item ("Dots", note->self_scm ());
if (dur.dot_count ()
!= robust_scm2int (d->get_property ("dot-count"), 0))
- d->set_property ("dot-count", scm_int2num (dur.dot_count ()));
+ d->set_property ("dot-count", scm_from_int (dur.dot_count ()));
d->set_parent (note, Y_AXIS);
Pitch *pit = unsmob_pitch (ev->get_property ("pitch"));
-#if 0
- /*
- TODO: should have a mechanism to switch off these warnings.
- */
+#if 0 /* TODO: should have a mechanism to switch off these warnings. */
+
if (!pit)
- {
- ev->origin ()->warning (_ ("NoteEvent without pitch"));
- }
+ ev->origin ()->warning (_ ("NoteEvent without pitch"));
#endif
-
+
int pos = pit ? pit->steps () : 0;
SCM c0 = get_property ("middleCPosition");
if (scm_is_number (c0))
pos += scm_to_int (c0);
- note->set_property ("staff-position", scm_int2num (pos));
+ note->set_property ("staff-position", scm_from_int (pos));
/*
- Shaped note heads change on step of the scale.
+ Shape note heads change on step of the scale.
*/
SCM shape_vector = get_property ("shapeNoteStyles");
if (scm_is_vector (shape_vector))
SCM style = SCM_EOL;
if (scm_c_vector_length (shape_vector) > delta
&& scm_is_symbol (scm_vector_ref (shape_vector, scm_from_int (delta))))
- {
- style = scm_vector_ref (shape_vector, scm_from_int (delta));
- }
+ style = scm_vector_ref (shape_vector, scm_from_int (delta));
if (scm_is_symbol (style))
- {
- note->set_property ("style", style);
- }
+ note->set_property ("style", style);
}
notes_.push (note);
note_evs_.clear ();
}
+#include "translator.icc"
+
ADD_TRANSLATOR (Note_heads_engraver,
- /* descr */ "Generate noteheads.",
- /* creats*/ "NoteHead Dots",
- /* accepts */ "note-event busy-playing-event",
- /* acks */ "",
- /* reads */ "middleCPosition",
+ /* doc */ "Generate noteheads.",
+ /* create */ "NoteHead Dots",
+ /* accept */ "note-event busy-playing-event",
+ /* read */ "middleCPosition",
/* write */ "");