X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcustos-engraver.cc;h=7d15aeaba85a77e91f5b772eeace86aafbd5fc1d;hb=a6a51abfd0195a3cf7d6ea095cf69808852f21ce;hp=94bc4910ce24336c5260a91afea5a4edf57d8e3c;hpb=16cb456cabf477f6d398ff731aa0f10b60913394;p=lilypond.git

diff --git a/lily/custos-engraver.cc b/lily/custos-engraver.cc
index 94bc4910ce..7d15aeaba8 100644
--- a/lily/custos-engraver.cc
+++ b/lily/custos-engraver.cc
@@ -1,14 +1,24 @@
 /*
-  custos-engraver.cc -- implement Custos_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
-
-  (c) 2000--2007 Juergen Reuter <reuter@ipd.uka.de>,
+  Copyright (C) 2000--2015 Juergen Reuter <reuter@ipd.uka.de>,
   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
+  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"
@@ -29,8 +39,8 @@ class Custos_engraver : public Engraver
 public:
   TRANSLATOR_DECLARATIONS (Custos_engraver);
   void start_translation_timestep ();
-  DECLARE_ACKNOWLEDGER (bar);
-  DECLARE_ACKNOWLEDGER (note_head);
+  void acknowledge_bar (Grob_info);
+  void acknowledge_note_head (Grob_info);
   void process_acknowledged ();
   void stop_translation_timestep ();
   virtual void finalize ();
@@ -38,11 +48,12 @@ public:
 private:
   Item *create_custos ();
   bool custos_permitted_;
-  vector<Grob*> custodes_;
+  vector<Grob *> custodes_;
   vector<Pitch> pitches_;
 };
 
-Custos_engraver::Custos_engraver ()
+Custos_engraver::Custos_engraver (Context *c)
+  : Engraver (c)
 {
   custos_permitted_ = false;
 }
@@ -65,9 +76,8 @@ 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;
 }
 
@@ -79,14 +89,14 @@ Custos_engraver::acknowledge_note_head (Grob_info info)
     {
 
       /*
-	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_back (*unsmob_pitch (ev->get_property ("pitch")));
+      pitches_.push_back (*unsmob<Pitch> (ev->get_property ("pitch")));
     }
 }
 
@@ -99,17 +109,17 @@ Custos_engraver::process_acknowledged ()
   if (custos_permitted_)
     {
       for (vsize i = pitches_.size (); i--;)
-	{
-	  Item *c = create_custos ();
+        {
+          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 ();
     }
@@ -133,11 +143,24 @@ Custos_engraver::finalize ()
   custodes_.clear ();
 }
 
-ADD_ACKNOWLEDGER (Custos_engraver, bar);
-ADD_ACKNOWLEDGER (Custos_engraver, note_head);
+
+void
+Custos_engraver::boot ()
+{
+  ADD_ACKNOWLEDGER (Custos_engraver, bar);
+  ADD_ACKNOWLEDGER (Custos_engraver, note_head);
+}
 
 ADD_TRANSLATOR (Custos_engraver,
-		/* doc */ "",
-		/* create */ "Custos",
-		/* read */ "",
-		/* write */ "");
+                /* doc */
+                "Engrave custodes.",
+
+                /* create */
+                "Custos ",
+
+                /* read */
+                "",
+
+                /* write */
+                ""
+               );