*** empty log message ***

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

diff --git a/lily/custos-engraver.cc b/lily/custos-engraver.cc
index 4343d696f8a0afec1624300257c5fb556a96b6b1..56347d07a45dcd412652d6c79f51edc44696ec98 100644 (file)
--- a/lily/custos-engraver.cc
+++ b/lily/custos-engraver.cc
@@ -15,6 +15,7 @@
 #include "warn.hh"
 #include "pitch.hh"
 
+#include "translator.icc"
 
 /*
  * This class implements an engraver for custos symbols.
@@ -26,22 +27,23 @@ class Custos_engraver : public Engraver
 {
 public:
   TRANSLATOR_DECLARATIONS (Custos_engraver);
-  PRECOMPUTED_VIRTUAL void start_translation_timestep ();
-  virtual void acknowledge_grob (Grob_info);
-  PRECOMPUTED_VIRTUAL void process_acknowledged ();
-  PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
+  void start_translation_timestep ();
+  DECLARE_ACKNOWLEDGER (bar);
+  DECLARE_ACKNOWLEDGER (note_head);
+  void process_acknowledged ();
+  void stop_translation_timestep ();
   virtual void finalize ();
 
 private:
   Item *create_custos ();
-  bool custos_permitted;
+  bool custos_permitted_;
   Link_array<Grob> custodes_;
   Array<Pitch> pitches_;
 };
 
 Custos_engraver::Custos_engraver ()
 {
-  custos_permitted = false;
+  custos_permitted_ = false;
 }
 
 void
@@ -52,7 +54,7 @@ Custos_engraver::stop_translation_timestep ()
   */
   pitches_.clear ();
 
-  custos_permitted = false;
+  custos_permitted_ = false;
 }
 
 void
@@ -62,29 +64,28 @@ Custos_engraver::start_translation_timestep ()
 }
 
 void
-Custos_engraver::acknowledge_grob (Grob_info info)
+Custos_engraver::acknowledge_bar (Grob_info info)
+{
+  (void) info;
+  custos_permitted_ = true;
+}
+
+void
+Custos_engraver::acknowledge_note_head (Grob_info info)
 {
-  Item *item = dynamic_cast<Item *> (info.grob ());
-  if (item)
+  Music *m = info.music_cause ();
+  if (m && m->is_mus_type ("note-event"))
     {
-      Music *m = info.music_cause ();
-      if (Bar_line::has_interface (info.grob ()))
-       custos_permitted = true;
-      else if (Note_head::has_interface (info.grob ())
-              && m
-              && m->is_mus_type ("note-event"))
-       {
 
-         /*
-           ideally, we'd do custos->set_parent (Y_AXIS, notehead),
-           but since the note head lives on the other system, we can't
+      /*
+       ideally, we'd do custos->set_parent (Y_AXIS, notehead),
+       but since the note head lives on the other system, we can't
 
-           So we copy the position from the note head pitch.  We
-           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_property ("pitch")));
-       }
+       So we copy the position from the note head pitch.  We
+       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_property ("pitch")));
     }
 }
 
@@ -92,9 +93,9 @@ void
 Custos_engraver::process_acknowledged ()
 {
   if (scm_is_string (get_property ("whichBar")))
-    custos_permitted = true;
+    custos_permitted_ = true;
 
-  if (custos_permitted)
+  if (custos_permitted_)
     {
       for (int i = pitches_.size (); i--;)
        {
@@ -106,7 +107,7 @@ Custos_engraver::process_acknowledged ()
            p += scm_to_int (c0);
 
          c->set_property ("staff-position",
-                          scm_int2num (p));
+                          scm_from_int (p));
        }
 
       pitches_.clear ();
@@ -127,18 +128,16 @@ void
 Custos_engraver::finalize ()
 {
   for (int i = custodes_.size (); i--;)
-    {
-      custodes_[i]->suicide ();
-    }
+    custodes_[i]->suicide ();
   custodes_.clear ();
 }
 
-#include "translator.icc"
+ADD_ACKNOWLEDGER (Custos_engraver, bar);
+ADD_ACKNOWLEDGER (Custos_engraver, note_head);
 
 ADD_TRANSLATOR (Custos_engraver,
-               /* descr */ "",
-               /* creats*/ "Custos",
-               /* accepts */ "",
-               /* acks  */ "bar-line-interface note-head-interface",
-               /* reads */ "",
+               /* doc */ "",
+               /* create */ "Custos",
+               /* accept */ "",
+               /* read */ "",
                /* write */ "");