Run grand-replace (issue 3765)

[lilypond.git] / lily / custos-engraver.cc

diff --git a/lily/custos-engraver.cc b/lily/custos-engraver.cc
index 3a82af9c7bcba5e4688371b64f82f1bfa21bd3cc..0ebb45cd8c2dc5cbc3999e6ccfa8ebe0ee6a65a9 100644 (file)
--- a/lily/custos-engraver.cc
+++ b/lily/custos-engraver.cc
@@ -1,23 +1,33 @@
 /*
-  custos-engraver.cc -- implement Custos_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2000--2014 Juergen Reuter <reuter@ipd.uka.de>,
+  Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2000--2005 Juergen Reuter <reuter@ipd.uka.de>,
-  Han-Wen Nienhuys <hanwen@cs.uu.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"
-#include "bar-line.hh"
 #include "item.hh"
 #include "note-head.hh"
+#include "pitch.hh"
 #include "staff-symbol-referencer.hh"
+#include "stream-event.hh"
 #include "warn.hh"
-#include "pitch.hh"
 
 #include "translator.icc"
 
-
 /*
  * This class implements an engraver for custos symbols.
  *
@@ -38,8 +48,8 @@ public:
 private:
   Item *create_custos ();
   bool custos_permitted_;
-  Link_array<Grob> custodes_;
-  Array<Pitch> pitches_;
+  vector<Grob *> custodes_;
+  vector<Pitch> pitches_;
 };
 
 Custos_engraver::Custos_engraver ()
@@ -65,28 +75,27 @@ Custos_engraver::start_translation_timestep ()
 }
 
 void
-Custos_engraver::acknowledge_bar (Grob_info info)
+Custos_engraver::acknowledge_bar (Grob_info /* info */)
 {
-  (void) info;
   custos_permitted_ = true;
 }
 
 void
 Custos_engraver::acknowledge_note_head (Grob_info info)
 {
-  Music *m = info.music_cause ();
-  if (m && m->is_mus_type ("note-event"))
+  Stream_event *ev = info.event_cause ();
+  if (ev && ev->in_event_class ("note-event"))
     {
 
       /*
-       ideally, we'd do custos->set_parent (Y_AXIS, notehead),
-       but since the note head lives on the other system, we can't
+        ideally, we'd do custos->set_parent (Y_AXIS, notehead),
+        but since the note head lives on the other system, we can't
 
-       So we copy the position from the note head pitch.  We
-       don't look at the staff-position, since we can't be sure
-       whether Clef_engraver already applied a vertical shift.
+        So we copy the position from the note head pitch.  We
+        don't look at the staff-position, since we can't be sure
+        whether Clef_engraver already applied a vertical shift.
       */
-      pitches_.push (*unsmob_pitch (m->get_property ("pitch")));
+      pitches_.push_back (*unsmob_pitch (ev->get_property ("pitch")));
     }
 }
 
@@ -98,18 +107,18 @@ Custos_engraver::process_acknowledged ()
 
   if (custos_permitted_)
     {
-      for (int i = pitches_.size (); i--;)
-       {
-         Item *c = create_custos ();
+      for (vsize i = pitches_.size (); i--;)
+        {
+          Item *c = create_custos ();
 
-         int p = pitches_[i].steps ();
-         SCM c0 = get_property ("middleCPosition");
-         if (scm_is_number (c0))
-           p += scm_to_int (c0);
+          int p = pitches_[i].steps ();
+          SCM c0 = get_property ("middleCPosition");
+          if (scm_is_number (c0))
+            p += scm_to_int (c0);
 
-         c->set_property ("staff-position",
-                          scm_from_int (p));
-       }
+          c->set_property ("staff-position",
+                           scm_from_int (p));
+        }
 
       pitches_.clear ();
     }
@@ -120,7 +129,7 @@ Custos_engraver::create_custos ()
 {
   Item *custos = make_item ("Custos", SCM_EOL);
 
-  custodes_.push (custos);
+  custodes_.push_back (custos);
 
   return custos;
 }
@@ -128,20 +137,24 @@ Custos_engraver::create_custos ()
 void
 Custos_engraver::finalize ()
 {
-  for (int i = custodes_.size (); i--;)
-    {
-      custodes_[i]->suicide ();
-    }
+  for (vsize i = custodes_.size (); i--;)
+    custodes_[i]->suicide ();
   custodes_.clear ();
 }
 
-
-ADD_ACKNOWLEDGER (Custos_engraver,bar);
-ADD_ACKNOWLEDGER (Custos_engraver,note_head);
+ADD_ACKNOWLEDGER (Custos_engraver, bar);
+ADD_ACKNOWLEDGER (Custos_engraver, note_head);
 
 ADD_TRANSLATOR (Custos_engraver,
-               /* descr */ "",
-               /* creats*/ "Custos",
-               /* accepts */ "",
-               /* reads */ "",
-               /* write */ "");
+                /* doc */
+                "Engrave custodes.",
+
+                /* create */
+                "Custos ",
+
+                /* read */
+                "",
+
+                /* write */
+                ""
+               );