patch::: 1.4.0.jcn4

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

diff --git a/lily/custos-engraver.cc b/lily/custos-engraver.cc
index 4f8cbcf5e32177ab908a2e6e72d41bb91c4f23fb..55c8c73f36a54af08bb772a1b204e312012ca63f 100644 (file)
--- a/lily/custos-engraver.cc
+++ b/lily/custos-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (C) 2000 Juergen Reuter <reuterj@ira.uka.de>,
+ (C) 2000 Juergen Reuter <reuterj@ira.uka.de>,
 
   Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
@@ -23,16 +23,16 @@
 class Custos_engraver : public Engraver
 {
 public:
-  Custos_engraver();
-  virtual void start_translation_timestep();
-  virtual void acknowledge_grob(Grob_info);
+  Custos_engraver ();
+  virtual void start_translation_timestep ();
+  virtual void acknowledge_grob (Grob_info);
   virtual void create_grobs ();
   virtual void stop_translation_timestep ();
-  virtual void do_removal_processing ();
-  VIRTUAL_COPY_CONS(Translator);
+  virtual void finalize ();
+  VIRTUAL_COPY_CONS (Translator);
 
 private:
-  Item * create_custos();
+  Item * create_custos ();
   bool custos_permitted;
   Link_array<Grob> custos_arr_;
   Array<Pitch> pitches_;
@@ -45,7 +45,7 @@ Custos_engraver::Custos_engraver ()
 
 
 void
-Custos_engraver::stop_translation_timestep()
+Custos_engraver::stop_translation_timestep ()
 {
   /*
     delay typeset until we're at the next moment, so we can silence custodes at the end of the piece.
@@ -69,7 +69,7 @@ Custos_engraver::start_translation_timestep ()
 void
 Custos_engraver::acknowledge_grob (Grob_info info)
 {
-  Item *item = dynamic_cast <Item *>(info.elem_l_);
+  Item *item = dynamic_cast <Item *> (info.elem_l_);
   if (item)
     {
       if (Bar::has_interface (info.elem_l_))
@@ -95,7 +95,7 @@ Custos_engraver::acknowledge_grob (Grob_info info)
 void
 Custos_engraver::create_grobs ()
 {
-  if (gh_string_p (get_property( "whichBar")))
+  if (gh_string_p (get_property ("whichBar")))
     custos_permitted = true;
   
   if (custos_permitted)
@@ -103,9 +103,15 @@ Custos_engraver::create_grobs ()
       for (int i = pitches_.size (); i--;)
        {
          Item *c = create_custos ();
+
+         int p = pitches_[i].steps ();
+         SCM c0 = get_property ("centralCPosition");
+         if (gh_number_p (c0))
+           p += gh_scm2int (c0);
+
          
          c->set_grob_property ("staff-position",
-                              gh_int2scm (pitches_[i].steps ()));
+                               gh_int2scm (p));
          
        }
 
@@ -114,7 +120,7 @@ Custos_engraver::create_grobs ()
 }
 
 Item* 
-Custos_engraver::create_custos()
+Custos_engraver::create_custos ()
 {
   SCM basicProperties = get_property ("Custos");
   Item* custos = new Item (basicProperties);
@@ -126,7 +132,7 @@ Custos_engraver::create_custos()
 }
 
 void
-Custos_engraver::do_removal_processing ()
+Custos_engraver::finalize ()
 {
   for (int i = custos_arr_.size (); i--;)
     {