X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-heads-engraver.cc;h=c972b2a1659c1f3840547d049f3c1fef746f3e16;hb=8dc5818f4487e019b729aac1187d1f4ca72996df;hp=807e8cc121eeed752f438e0d4e04bf85f5cccb80;hpb=4c1b05d4d94f84248cce5a8a4c7ae58c2e04bf54;p=lilypond.git diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc index 807e8cc121..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,7 +61,7 @@ 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++) { @@ -80,15 +79,16 @@ 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 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 (); }