Run grand-replace (issue 3765)

[lilypond.git] / lily / note-heads-engraver.cc

diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc
index 807e8cc121eeed752f438e0d4e04bf85f5cccb80..5caf42f221838eebbcd28fd7c5bd4d3c957f5a3a 100644 (file)
--- 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--2014 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,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++)
     {
@@ -74,67 +73,65 @@ Note_heads_engraver::process_music ()
 #if 0 /* TODO: should have a mechanism to switch off these warnings. */
 
       if (!pit)
-       ev->origin ()->warning (_ ("NoteEvent without pitch"));
+        ev->origin ()->warning (_ ("NoteEvent without pitch"));
 #endif
 
       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));
-      }
+        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 ();
+        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));
 
       /*
-       Shape note heads change on step of the scale.
+        Shape note heads change on step of the scale.
       */
       SCM shape_vector = get_property ("shapeNoteStyles");
       if (scm_is_vector (shape_vector))
-       {
-         SCM scm_tonic = get_property ("tonic");
-         Pitch tonic (0, 0, 0);
-         if (unsmob_pitch (scm_tonic))
-           tonic = *unsmob_pitch (scm_tonic);
-
-         unsigned int delta = (pit->get_notename () - tonic.get_notename () + 7) % 7;
-
-         SCM style = SCM_EOL;
-         if (scm_c_vector_length (shape_vector) > delta
-             && scm_is_symbol (scm_vector_ref (shape_vector, scm_from_int (delta))))
-           style = scm_vector_ref (shape_vector, scm_from_int (delta));
-         if (scm_is_symbol (style))
-           note->set_property ("style", style);
-       }
-
-      notes_.push_back (note);
+        {
+          SCM scm_tonic = get_property ("tonic");
+          Pitch tonic (0, 0, 0);
+          if (unsmob_pitch (scm_tonic))
+            tonic = *unsmob_pitch (scm_tonic);
+
+          unsigned int delta = (pit->get_notename () - tonic.get_notename () + 7) % 7;
+
+          SCM style = SCM_EOL;
+          if (scm_c_vector_length (shape_vector) > delta
+              && scm_is_symbol (scm_vector_ref (shape_vector, scm_from_int (delta))))
+            style = scm_vector_ref (shape_vector, scm_from_int (delta));
+          if (scm_is_symbol (style))
+            note->set_property ("style", style);
+        }
     }
 }
 
 void
 Note_heads_engraver::stop_translation_timestep ()
 {
-  notes_.clear ();
   note_evs_.clear ();
 }
 
 ADD_TRANSLATOR (Note_heads_engraver,
-               /* doc */
-               "Generate note heads.",
+                /* doc */
+                "Generate note heads.",
 
-               /* create */
-               "NoteHead ",
+                /* create */
+                "NoteHead ",
 
-               /* read */
-               "middleCPosition "
-               "staffLineLayoutFunction ",
+                /* read */
+                "middleCPosition "
+                "staffLineLayoutFunction ",
 
-               /* write */
-               ""
-               );
+                /* write */
+                ""
+               );