X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcustos-engraver.cc;h=78342bbfed5351a2ead9293539525f1329627831;hb=ca20eaa74e7e762c0611de26cc2267909ae27e02;hp=46c82969c60fc7a89f35082eed9876fef7c65bf8;hpb=cd93507bb0b0559c7d916c1b19d7ac1f83d1cc8e;p=lilypond.git

diff --git a/lily/custos-engraver.cc b/lily/custos-engraver.cc
index 46c82969c6..78342bbfed 100644
--- a/lily/custos-engraver.cc
+++ b/lily/custos-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  2000--2003 Juergen Reuter <reuter@ipd.uka.de>,
+  (c) 2000--2005 Juergen Reuter <reuter@ipd.uka.de>,
                   Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
@@ -13,7 +13,6 @@
 #include "note-head.hh"
 #include "staff-symbol-referencer.hh"
 #include "warn.hh"
-#include "event.hh"
 
 /*
  * This class implements an engraver for custos symbols.
@@ -24,7 +23,8 @@
 class Custos_engraver : public Engraver
 {
 public:
-TRANSLATOR_DECLARATIONS(  Custos_engraver);
+  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 ();
@@ -47,19 +47,20 @@ Custos_engraver::Custos_engraver ()
 void
 Custos_engraver::stop_translation_timestep ()
 {
-  for (int i = custodes_.size (); i--;)
-    {
-      typeset_grob (custodes_[i]);
-    }
-
   /*
-    delay clear until we're at the next moment, so we can silence
-    custodes at the end of the piece.
+    delay typeset until we're at the next moment, so we can silence custodes at the end of the piece.
    */
   pitches_.clear ();
+
   custos_permitted = false;
 }
 
+void
+Custos_engraver::start_translation_timestep ()
+{
+  custodes_.clear ();
+}
+
 
 void
 Custos_engraver::acknowledge_grob (Grob_info info)
@@ -67,7 +68,7 @@ Custos_engraver::acknowledge_grob (Grob_info info)
   Item *item = dynamic_cast <Item *> (info.grob_);
   if (item)
     {
-      Music * m = info.music_cause();
+      Music * m = info.music_cause ();
       if (Bar_line::has_interface (info.grob_))
 	custos_permitted = true;
       else if (Note_head::has_interface (info.grob_)
@@ -83,7 +84,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.
 	  */
-	    pitches_.push (*unsmob_pitch (m->get_mus_property ("pitch")));
+	    pitches_.push (*unsmob_pitch (m->get_property ("pitch")));
 	}
     }
 }
@@ -91,7 +92,7 @@ Custos_engraver::acknowledge_grob (Grob_info info)
 void
 Custos_engraver::process_acknowledged_grobs ()
 {
-  if (gh_string_p (get_property ("whichBar")))
+  if (scm_is_string (get_property ("whichBar")))
     custos_permitted = true;
   
   if (custos_permitted)
@@ -101,13 +102,13 @@ Custos_engraver::process_acknowledged_grobs ()
 	  Item *c = create_custos ();
 
 	  int p = pitches_[i].steps ();
-	  SCM c0 = get_property ("centralCPosition");
-	  if (gh_number_p (c0))
-	    p += gh_scm2int (c0);
+	  SCM c0 = get_property ("middleCPosition");
+	  if (scm_is_number (c0))
+	    p += scm_to_int (c0);
 
 	  
-	  c->set_grob_property ("staff-position",
-				gh_int2scm (p));
+	  c->set_property ("staff-position",
+				scm_int2num (p));
 	  
 	}
 
@@ -118,10 +119,9 @@ Custos_engraver::process_acknowledged_grobs ()
 Item* 
 Custos_engraver::create_custos ()
 {
-  SCM basicProperties = get_property ("Custos");
-  Item* custos = new Item (basicProperties);
+  Item* custos = make_item ("Custos", SCM_EOL);
+  
   
-  announce_grob(custos, SCM_EOL);
   custodes_.push (custos);
   
   return custos;
@@ -139,7 +139,7 @@ Custos_engraver::finalize ()
 
 
 
-ENTER_DESCRIPTION(Custos_engraver,
+ADD_TRANSLATOR (Custos_engraver,
 /* descr */       "",
 /* creats*/       "Custos",
 /* accepts */     "",