X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-heads-engraver.cc;h=c972b2a1659c1f3840547d049f3c1fef746f3e16;hb=27945b310409e8e0e76ceffc5aa34851448239b8;hp=a549d0a69ad2599389b00ee5a1964e8802302919;hpb=e18531db1f79fb685fbd16d6a2a67bf4b6c09915;p=lilypond.git diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc index a549d0a69a..c972b2a165 100644 --- a/lily/note-heads-engraver.cc +++ b/lily/note-heads-engraver.cc @@ -35,8 +35,7 @@ using namespace std; class Note_heads_engraver : public Engraver { - vector notes_; - vector note_evs_; + vector note_evs_; public: TRANSLATOR_DECLARATIONS (Note_heads_engraver); @@ -62,8 +61,8 @@ void Note_heads_engraver::process_music () { SCM c0 = get_property ("middleCPosition"); - SCM layout_proc = get_property("staffLineLayoutFunction"); - + SCM layout_proc = get_property ("staffLineLayoutFunction"); + for (vsize i = 0; i < note_evs_.size (); i++) { Stream_event *ev = note_evs_[i]; @@ -80,16 +79,17 @@ Note_heads_engraver::process_music () 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 + 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); - + pos += scm_to_int (c0); + note->set_property ("staff-position", scm_from_int (pos)); /* @@ -112,15 +112,12 @@ Note_heads_engraver::process_music () 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 (); }