X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcustos-engraver.cc;h=b68ed603882f9a7c79325cfddb23632a0427297d;hb=9d4a5bbc9687aef811a60aabd9cb839412984e96;hp=080121da8b8bacf16f2c74d6aae1ffce40b0b2a5;hpb=e53b6ddc057f5419b4bc6219f0cf6132a487a305;p=lilypond.git

diff --git a/lily/custos-engraver.cc b/lily/custos-engraver.cc
index 080121da8b..b68ed60388 100644
--- 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--2006 Juergen Reuter <reuter@ipd.uka.de>,
+  Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
@@ -13,7 +13,9 @@
 #include "note-head.hh"
 #include "staff-symbol-referencer.hh"
 #include "warn.hh"
-#include "event.hh"
+#include "pitch.hh"
+
+#include "translator.icc"
 
 /*
  * This class implements an engraver for custos symbols.
@@ -25,35 +27,34 @@ class Custos_engraver : public Engraver
 {
 public:
   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 ();
+  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;
-  Link_array<Grob> custodes_;
-  Array<Pitch> pitches_;
+  Item *create_custos ();
+  bool custos_permitted_;
+  Link_array__Grob_ custodes_;
+  std::vector<Pitch> pitches_;
 };
 
 Custos_engraver::Custos_engraver ()
 {
-  custos_permitted = false;
+  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.
-   */
+  */
   pitches_.clear ();
 
-  custos_permitted = false;
+  custos_permitted_ = false;
 }
 
 void
@@ -62,88 +63,81 @@ Custos_engraver::start_translation_timestep ()
   custodes_.clear ();
 }
 
+void
+Custos_engraver::acknowledge_bar (Grob_info info)
+{
+  (void) info;
+  custos_permitted_ = true;
+}
 
 void
-Custos_engraver::acknowledge_grob (Grob_info info)
+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_back (*unsmob_pitch (m->get_property ("pitch")));
     }
 }
 
 void
-Custos_engraver::process_acknowledged_grobs ()
+Custos_engraver::process_acknowledged ()
 {
   if (scm_is_string (get_property ("whichBar")))
-    custos_permitted = true;
-  
-  if (custos_permitted)
+    custos_permitted_ = true;
+
+  if (custos_permitted_)
     {
-      for (int i = pitches_.size (); i--;)
+      for (vsize i = pitches_.size (); i--;)
 	{
 	  Item *c = create_custos ();
 
 	  int p = pitches_[i].steps ();
 	  SCM c0 = get_property ("middleCPosition");
-	  if (ly_c_number_p (c0))
+	  if (scm_is_number (c0))
 	    p += scm_to_int (c0);
 
-	  
 	  c->set_property ("staff-position",
-				scm_int2num (p));
-	  
+			   scm_from_int (p));
 	}
 
       pitches_.clear ();
     }
 }
 
-Item* 
+Item *
 Custos_engraver::create_custos ()
 {
-  Item* custos = make_item ("Custos", SCM_EOL);
-  
-  
-  custodes_.push (custos);
-  
+  Item *custos = make_item ("Custos", SCM_EOL);
+
+  custodes_.push_back (custos);
+
   return custos;
 }
 
 void
 Custos_engraver::finalize ()
 {
-  for (int i = custodes_.size (); i--;)
-    {
-      custodes_[i]->suicide ();
-    }
+  for (vsize i = custodes_.size (); i--;)
+    custodes_[i]->suicide ();
   custodes_.clear ();
 }
 
+ADD_ACKNOWLEDGER (Custos_engraver, bar);
+ADD_ACKNOWLEDGER (Custos_engraver, note_head);
 
-
-ENTER_DESCRIPTION (Custos_engraver,
-/* descr */       "",
-/* creats*/       "Custos",
-/* accepts */     "",
-/* acks  */      "bar-line-interface note-head-interface",
-/* reads */       "",
-/* write */       "");
+ADD_TRANSLATOR (Custos_engraver,
+		/* doc */ "",
+		/* create */ "Custos",
+		/* accept */ "",
+		/* read */ "",
+		/* write */ "");