X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcustos-engraver.cc;h=f1111e829e5bdf033ed1c3e670002bba50085782;hb=62268b9718b5a47ae1dae3c7d0bfbdc693a22525;hp=3a82af9c7bcba5e4688371b64f82f1bfa21bd3cc;hpb=811be522d0b79493159f47789e5621dc85493495;p=lilypond.git

diff --git a/lily/custos-engraver.cc b/lily/custos-engraver.cc
index 3a82af9c7b..f1111e829e 100644
--- a/lily/custos-engraver.cc
+++ b/lily/custos-engraver.cc
@@ -1,23 +1,34 @@
 /*
-  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--2011 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 +49,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,17 +76,16 @@ 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"))
     {
 
       /*
@@ -86,7 +96,7 @@ Custos_engraver::acknowledge_note_head (Grob_info info)
 	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,7 +108,7 @@ Custos_engraver::process_acknowledged ()
 
   if (custos_permitted_)
     {
-      for (int i = pitches_.size (); i--;)
+      for (vsize i = pitches_.size (); i--;)
 	{
 	  Item *c = create_custos ();
 
@@ -120,7 +130,7 @@ Custos_engraver::create_custos ()
 {
   Item *custos = make_item ("Custos", SCM_EOL);
 
-  custodes_.push (custos);
+  custodes_.push_back (custos);
 
   return custos;
 }
@@ -128,20 +138,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 */
+		""
+		);