Update.

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

diff --git a/lily/custos-engraver.cc b/lily/custos-engraver.cc
index 173fb6720ca755ab975a2142f825493404697820..0c5157d599c976e620a7e11747e360cf0ac14b51 100644 (file)
--- a/lily/custos-engraver.cc
+++ b/lily/custos-engraver.cc
@@ -3,8 +3,8 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2004 Juergen Reuter <reuter@ipd.uka.de>,
-                  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2005 Juergen Reuter <reuter@ipd.uka.de>,
+  Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "engraver.hh"
@@ -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,16 +23,15 @@
 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 ();
   virtual void finalize ();
 
-
 private:
-  Item * create_custos ();
+  Item *create_custos ();
   bool custos_permitted;
   Link_array<Grob> custodes_;
   Array<Pitch> pitches_;
@@ -44,17 +42,12 @@ Custos_engraver::Custos_engraver ()
   custos_permitted = false;
 }
 
-
 void
 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.
-   */
-  for (int i = custodes_.size (); i--;)
-    {
-      typeset_grob (custodes_[i]);
-    }
+  */
   pitches_.clear ();
 
   custos_permitted = false;
@@ -66,14 +59,13 @@ Custos_engraver::start_translation_timestep ()
   custodes_.clear ();
 }
 
-
 void
 Custos_engraver::acknowledge_grob (Grob_info info)
 {
-  Item *item = dynamic_cast <Item *> (info.grob_);
+  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_)
@@ -89,7 +81,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")));
        }
     }
 }
@@ -97,9 +89,9 @@ 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)
     {
       for (int i = pitches_.size (); i--;)
@@ -107,28 +99,25 @@ 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);
-
-         
-         c->set_grob_property ("staff-position",
-                               gh_int2scm (p));
-         
+         SCM c0 = get_property ("middleCPosition");
+         if (scm_is_number (c0))
+           p += scm_to_int (c0);
+
+         c->set_property ("staff-position",
+                          scm_int2num (p));
        }
 
       pitches_.clear ();
     }
 }
 
-Item* 
+Item *
 Custos_engraver::create_custos ()
 {
-  Item* custos = make_item ("Custos");
-  
-  announce_grob(custos, SCM_EOL);
+  Item *custos = make_item ("Custos", SCM_EOL);
+
   custodes_.push (custos);
-  
+
   return custos;
 }
 
@@ -138,17 +127,14 @@ Custos_engraver::finalize ()
   for (int i = custodes_.size (); i--;)
     {
       custodes_[i]->suicide ();
-      typeset_grob (custodes_[i]);
     }
   custodes_.clear ();
 }
 
-
-
-ENTER_DESCRIPTION(Custos_engraver,
-/* descr */       "",
-/* creats*/       "Custos",
-/* accepts */     "",
-/* acks  */      "bar-line-interface note-head-interface",
-/* reads */       "",
-/* write */       "");
+ADD_TRANSLATOR (Custos_engraver,
+               /* descr */ "",
+               /* creats*/ "Custos",
+               /* accepts */ "",
+               /* acks  */ "bar-line-interface note-head-interface",
+               /* reads */ "",
+               /* write */ "");