/*
- note-heads-engraver.cc -- part of GNU LilyPond
+ This file is part of LilyPond, the GNU music typesetter.
- (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+ LilyPond is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ LilyPond is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
*/
#include "engraver.hh"
class Note_heads_engraver : public Engraver
{
- vector<Item*> notes_;
- vector<Stream_event*> note_evs_;
+ vector<Stream_event *> note_evs_;
public:
TRANSLATOR_DECLARATIONS (Note_heads_engraver);
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");
+ 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);
if (scm_is_symbol (style))
note->set_property ("style", style);
}
-
- notes_.push_back (note);
}
}
void
Note_heads_engraver::stop_translation_timestep ()
{
- notes_.clear ();
note_evs_.clear ();
}
ADD_TRANSLATOR (Note_heads_engraver,
- /* doc */ "Generate noteheads.",
+ /* doc */
+ "Generate note heads.",
+
/* create */
"NoteHead ",
+
/* read */
- "middleCPosition",
+ "middleCPosition "
+ "staffLineLayoutFunction ",
+
/* write */
- "");
+ ""
+ );