X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcustos-engraver.cc;h=173fb6720ca755ab975a2142f825493404697820;hb=7e72a1e50e94a7f9738d62599de79fe7745f600c;hp=faec3cd556d0df940823e532484188f66aa95587;hpb=af9078fd6d63dea5141e87a1b4d7cb5b0bcba84a;p=lilypond.git

diff --git a/lily/custos-engraver.cc b/lily/custos-engraver.cc
index faec3cd556..173fb6720c 100644
--- a/lily/custos-engraver.cc
+++ b/lily/custos-engraver.cc
@@ -3,30 +3,31 @@
 
   source file of the GNU LilyPond music typesetter
 
- (C) 2000 Juergen Reuter <reuterj@ira.uka.de>,
-
-  Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
+  (c) 2000--2004 Juergen Reuter <reuter@ipd.uka.de>,
+                  Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "engraver.hh"
-#include "bar.hh"
+#include "bar-line.hh"
 #include "item.hh"
 #include "note-head.hh"
 #include "staff-symbol-referencer.hh"
 #include "warn.hh"
-#include "musical-request.hh"
+#include "event.hh"
 
 /*
-  This class implements an engraver for custos symbols.
-*/
+ * This class implements an engraver for custos symbols.
+ *
+ * FIXME: note heads inside of ligatures (i.e. ligature heads) are
+ * sometimes not recognized by this engraver. --jr
+ */
 class Custos_engraver : public Engraver
 {
 public:
 TRANSLATOR_DECLARATIONS(  Custos_engraver);
   virtual void start_translation_timestep ();
   virtual void acknowledge_grob (Grob_info);
-  virtual void create_grobs ();
+  virtual void process_acknowledged_grobs ();
   virtual void stop_translation_timestep ();
   virtual void finalize ();
 
@@ -34,7 +35,7 @@ TRANSLATOR_DECLARATIONS(  Custos_engraver);
 private:
   Item * create_custos ();
   bool custos_permitted;
-  Link_array<Grob> custos_arr_;
+  Link_array<Grob> custodes_;
   Array<Pitch> pitches_;
 };
 
@@ -50,31 +51,34 @@ 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.
    */
-}
-
-void
-Custos_engraver::start_translation_timestep ()
-{
-  for (int i = custos_arr_.size (); i--;)
+  for (int i = custodes_.size (); i--;)
     {
-      typeset_grob (custos_arr_[i]);
+      typeset_grob (custodes_[i]);
     }
-  custos_arr_.clear ();
   pitches_.clear ();
 
   custos_permitted = false;
 }
 
+void
+Custos_engraver::start_translation_timestep ()
+{
+  custodes_.clear ();
+}
+
 
 void
 Custos_engraver::acknowledge_grob (Grob_info info)
 {
-  Item *item = dynamic_cast <Item *> (info.grob_l_);
+  Item *item = dynamic_cast <Item *> (info.grob_);
   if (item)
     {
-      if (Bar::has_interface (info.grob_l_))
+      Music * m = info.music_cause();
+      if (Bar_line::has_interface (info.grob_))
 	custos_permitted = true;
-      else if (Note_head::has_interface (info.grob_l_))
+      else if (Note_head::has_interface (info.grob_)
+	       && m
+	       && m->is_mus_type ("note-event"))
 	{
 
 	  /*
@@ -85,15 +89,13 @@ 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.
 	  */
-	  Note_req * nr = dynamic_cast<Note_req*> (info.music_cause ());
-	  if (nr)
-	    pitches_.push (*unsmob_pitch (nr->get_mus_property ("pitch")));
+	    pitches_.push (*unsmob_pitch (m->get_mus_property ("pitch")));
 	}
     }
 }
 
 void
-Custos_engraver::create_grobs ()
+Custos_engraver::process_acknowledged_grobs ()
 {
   if (gh_string_p (get_property ("whichBar")))
     custos_permitted = true;
@@ -122,11 +124,10 @@ Custos_engraver::create_grobs ()
 Item* 
 Custos_engraver::create_custos ()
 {
-  SCM basicProperties = get_property ("Custos");
-  Item* custos = new Item (basicProperties);
+  Item* custos = make_item ("Custos");
   
-  announce_grob (custos, 0);
-  custos_arr_.push (custos);
+  announce_grob(custos, SCM_EOL);
+  custodes_.push (custos);
   
   return custos;
 }
@@ -134,12 +135,12 @@ Custos_engraver::create_custos ()
 void
 Custos_engraver::finalize ()
 {
-  for (int i = custos_arr_.size (); i--;)
+  for (int i = custodes_.size (); i--;)
     {
-      custos_arr_[i]->suicide ();
-      typeset_grob (custos_arr_[i]);
+      custodes_[i]->suicide ();
+      typeset_grob (custodes_[i]);
     }
-  custos_arr_.clear ();
+  custodes_.clear ();
 }
 
 
@@ -147,6 +148,7 @@ Custos_engraver::finalize ()
 ENTER_DESCRIPTION(Custos_engraver,
 /* descr */       "",
 /* creats*/       "Custos",
-/* acks  */       "bar-line-interface note-head-interface",
+/* accepts */     "",
+/* acks  */      "bar-line-interface note-head-interface",
 /* reads */       "",
 /* write */       "");