''

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

diff --git a/lily/custos-engraver.cc b/lily/custos-engraver.cc
index aed720a86fb33b1c89fe05426e508011bdb8ebd7..4e9d281743570bb634cbb369d7440d9a918957f2 100644 (file)
--- a/lily/custos-engraver.cc
+++ b/lily/custos-engraver.cc
@@ -3,14 +3,14 @@
 
   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>
   
 */
 
 #include "engraver.hh"
-#include "bar.hh"
+#include "bar-line.hh"
 #include "item.hh"
 #include "note-head.hh"
 #include "staff-symbol-referencer.hh"
@@ -23,16 +23,16 @@
 class Custos_engraver : public Engraver
 {
 public:
-  Custos_engraver();
-  virtual void start_translation_timestep();
-  virtual void acknowledge_grob(Grob_info);
-  virtual void create_grobs ();
+TRANSLATOR_DECLARATIONS(  Custos_engraver);
+  virtual void start_translation_timestep ();
+  virtual void acknowledge_grob (Grob_info);
+  virtual void process_acknowledged_grobs ();
   virtual void stop_translation_timestep ();
   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,12 +69,12 @@ 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.grob_l_);
   if (item)
     {
-      if (Bar::has_interface (info.elem_l_))
+      if (Bar_line::has_interface (info.grob_l_))
        custos_permitted = true;
-      else if (Note_head::has_interface (info.elem_l_))
+      else if (Note_head::has_interface (info.grob_l_))
        {
 
          /*
@@ -85,7 +85,7 @@ Custos_engraver::acknowledge_grob (Grob_info info)
            don't look at the staff-position, since we can't be sure
            whether Clef_engraver already applied a vertical shift.
          */
-         Note_req * nr = dynamic_cast<Note_req*> (info.req_l_);
+         Note_req * nr = dynamic_cast<Note_req*> (info.music_cause ());
          if (nr)
            pitches_.push (*unsmob_pitch (nr->get_mus_property ("pitch")));
        }
@@ -93,9 +93,9 @@ Custos_engraver::acknowledge_grob (Grob_info info)
 }
 
 void
-Custos_engraver::create_grobs ()
+Custos_engraver::process_acknowledged_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,12 +120,12 @@ Custos_engraver::create_grobs ()
 }
 
 Item* 
-Custos_engraver::create_custos()
+Custos_engraver::create_custos ()
 {
   SCM basicProperties = get_property ("Custos");
   Item* custos = new Item (basicProperties);
   
-  announce_grob (custos, 0);
+  announce_grob(custos, SCM_EOL);
   custos_arr_.push (custos);
   
   return custos;
@@ -136,5 +142,11 @@ Custos_engraver::finalize ()
   custos_arr_.clear ();
 }
 
-ADD_THIS_TRANSLATOR (Custos_engraver);
 
+
+ENTER_DESCRIPTION(Custos_engraver,
+/* descr */       "",
+/* creats*/       "Custos",
+/* acks  */       "bar-line-interface note-head-interface",
+/* reads */       "",
+/* write */       "");