patch::: 1.4.0.jcn4

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

diff --git a/lily/custos-engraver.cc b/lily/custos-engraver.cc
index 018d772de0dfbe2f65915d01818235745a71f777..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,19 +23,18 @@
 class Custos_engraver : public Engraver
 {
 public:
-  Custos_engraver();
-  virtual void do_post_move_processing();
-  virtual void acknowledge_element(Score_element_info);
-  void deprecated_process_music ();
-  virtual void process_acknowledged ();
-  virtual void do_pre_move_processing ();
-  virtual void do_removal_processing ();
-  VIRTUAL_COPY_CONS(Translator);
+  Custos_engraver ();
+  virtual void start_translation_timestep ();
+  virtual void acknowledge_grob (Grob_info);
+  virtual void create_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<Score_element> custos_arr_;
+  Link_array<Grob> custos_arr_;
   Array<Pitch> pitches_;
 };
 
@@ -46,7 +45,7 @@ Custos_engraver::Custos_engraver ()
 
 
 void
-Custos_engraver::do_pre_move_processing()
+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.
@@ -54,11 +53,11 @@ Custos_engraver::do_pre_move_processing()
 }
 
 void
-Custos_engraver::do_post_move_processing ()
+Custos_engraver::start_translation_timestep ()
 {
   for (int i = custos_arr_.size (); i--;)
     {
-      typeset_element (custos_arr_[i]);
+      typeset_grob (custos_arr_[i]);
     }
   custos_arr_.clear ();
   pitches_.clear ();
@@ -67,20 +66,10 @@ Custos_engraver::do_post_move_processing ()
 }
 
 
-/*
-  TODO check if this works with forced bar lines?
- */
-void
-Custos_engraver::deprecated_process_music ()
-{
-  if (gh_string_p (get_property( "whichBar")))
-    custos_permitted = true;
-}
-
 void
-Custos_engraver::acknowledge_element (Score_element_info info)
+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_))
@@ -104,18 +93,25 @@ Custos_engraver::acknowledge_element (Score_element_info info)
 }
 
 void
-Custos_engraver::process_acknowledged ()
+Custos_engraver::create_grobs ()
 {
-  deprecated_process_music ();
-
+  if (gh_string_p (get_property ("whichBar")))
+    custos_permitted = true;
+  
   if (custos_permitted)
     {
       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_elt_property ("staff-position",
-                              gh_int2scm (pitches_[i].steps ()));
+         c->set_grob_property ("staff-position",
+                               gh_int2scm (p));
          
        }
 
@@ -124,24 +120,24 @@ Custos_engraver::process_acknowledged ()
 }
 
 Item* 
-Custos_engraver::create_custos()
+Custos_engraver::create_custos ()
 {
   SCM basicProperties = get_property ("Custos");
   Item* custos = new Item (basicProperties);
   
-  announce_element (custos, 0);
+  announce_grob (custos, 0);
   custos_arr_.push (custos);
   
   return custos;
 }
 
 void
-Custos_engraver::do_removal_processing ()
+Custos_engraver::finalize ()
 {
   for (int i = custos_arr_.size (); i--;)
     {
       custos_arr_[i]->suicide ();
-      typeset_element (custos_arr_[i]);
+      typeset_grob (custos_arr_[i]);
     }
   custos_arr_.clear ();
 }