X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-heads-engraver.cc;h=4aa97dd4b90c62666feb682274a967c38c536aa7;hb=0052082fd05c21b95cdd5f20c2a11d14e3ce2d1f;hp=a549d0a69ad2599389b00ee5a1964e8802302919;hpb=bc95f4434f760d41191341ab4508b2064eb19025;p=lilypond.git

diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc
index a549d0a69a..4aa97dd4b9 100644
--- a/lily/note-heads-engraver.cc
+++ b/lily/note-heads-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2011 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
@@ -35,8 +35,7 @@ using namespace std;
 
 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);
@@ -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 ();
 }