/*
note-heads-engraver.cc -- part of GNU LilyPond
- (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "engraver.hh"
#include <cctype>
using namespace std;
-#include "dots.hh"
-#include "dot-column.hh"
#include "duration.hh"
#include "item.hh"
#include "output-def.hh"
class Note_heads_engraver : public Engraver
{
vector<Item*> notes_;
- vector<Item*> dots_;
vector<Stream_event*> note_evs_;
public:
void
Note_heads_engraver::process_music ()
{
+ SCM c0 = get_property ("middleCPosition");
+ SCM layout_proc = get_property("staffLineLayoutFunction");
+
for (vsize i = 0; i < note_evs_.size (); i++)
{
Stream_event *ev = note_evs_[i];
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);
+ int pos;
+ if (pit == 0)
+ pos = 0;
+ else if (ly_is_procedure (layout_proc)){
+ SCM pitch = ev->get_property("pitch");
+ pos = scm_to_int(scm_call_1 (layout_proc, pitch));
+ }
+ else
+ pos = pit->steps ();
+ if (scm_is_number (c0))
+ pos += scm_to_int(c0);
+
note->set_property ("staff-position", scm_from_int (pos));
/*
Note_heads_engraver::stop_translation_timestep ()
{
notes_.clear ();
- dots_.clear ();
note_evs_.clear ();
}
ADD_TRANSLATOR (Note_heads_engraver,
- /* doc */ "Generate noteheads.",
+ /* doc */
+ "Generate note heads.",
+
/* create */
- "NoteHead "
- "Dots",
- /* accept */
- "note-event",
- /* read */ "middleCPosition",
- /* write */ "");
+ "NoteHead ",
+
+ /* read */
+ "middleCPosition "
+ "staffLineLayoutFunction ",
+
+ /* write */
+ ""
+ );