lilypond-manuals.css: edit color scheme and some spacing

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

diff --git a/lily/custos-engraver.cc b/lily/custos-engraver.cc
index 00044094a6ad6ea65a1b41656972a655465396ab..7d15aeaba85a77e91f5b772eeace86aafbd5fc1d 100644 (file)
--- a/lily/custos-engraver.cc
+++ b/lily/custos-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2000--2010 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
@@ -19,7 +19,6 @@
 */
 
 #include "engraver.hh"
-#include "bar-line.hh"
 #include "item.hh"
 #include "note-head.hh"
 #include "pitch.hh"
@@ -40,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 ();
@@ -49,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;
 }
@@ -89,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")));
     }
 }
 
@@ -109,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 ();
     }
@@ -143,19 +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 */
-               "Engrave custodes.",
+                /* doc */
+                "Engrave custodes.",
 
-               /* create */
-               "Custos ",
+                /* create */
+                "Custos ",
 
-               /* read */
-               "",
+                /* read */
+                "",
 
-               /* write */
-               ""
-               );
+                /* write */
+                ""
+               );