X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fcustos-engraver.cc;h=928fde107eb70d5e065067ad9095cbb42a3e7435;hb=c05008764f5b4cf61e975e8f57bfe02be237d2ce;hp=aed720a86fb33b1c89fe05426e508011bdb8ebd7;hpb=07a5ed85c189a97d04c550679826dfc5eca2eb18;p=lilypond.git

diff --git a/lily/custos-engraver.cc b/lily/custos-engraver.cc
index aed720a86f..928fde107e 100644
--- a/lily/custos-engraver.cc
+++ b/lily/custos-engraver.cc
@@ -3,38 +3,39 @@
 
   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:
-  Custos_engraver();
-  virtual void start_translation_timestep();
-  virtual void acknowledge_grob(Grob_info);
-  virtual void create_grobs ();
+  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 ();
-  VIRTUAL_COPY_CONS(Translator);
+
 
 private:
-  Item * create_custos();
+  Item * create_custos ();
   bool custos_permitted;
-  Link_array<Grob> custos_arr_;
+  Link_array<Grob> custodes_;
   Array<Pitch> pitches_;
 };
 
@@ -45,36 +46,35 @@ Custos_engraver::Custos_engraver ()
 
 
 void
-Custos_engraver::stop_translation_timestep()
+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;
 }
 
 void
 Custos_engraver::start_translation_timestep ()
 {
-  for (int i = custos_arr_.size (); i--;)
-    {
-      typeset_grob (custos_arr_[i]);
-    }
-  custos_arr_.clear ();
-  pitches_.clear ();
-
-  custos_permitted = false;
+  custodes_.clear ();
 }
 
 
 void
 Custos_engraver::acknowledge_grob (Grob_info info)
 {
-  Item *item = dynamic_cast <Item *>(info.elem_l_);
+  Item *item = dynamic_cast <Item *> (info.grob_);
   if (item)
     {
-      if (Bar::has_interface (info.elem_l_))
+      Music * m = info.music_cause ();
+      if (Bar_line::has_interface (info.grob_))
 	custos_permitted = true;
-      else if (Note_head::has_interface (info.elem_l_))
+      else if (Note_head::has_interface (info.grob_)
+	       && m
+	       && m->is_mus_type ("note-event"))
 	{
 
 	  /*
@@ -85,17 +85,15 @@ 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.req_l_);
-	  if (nr)
-	    pitches_.push (*unsmob_pitch (nr->get_mus_property ("pitch")));
+	    pitches_.push (*unsmob_pitch (m->get_property ("pitch")));
 	}
     }
 }
 
 void
-Custos_engraver::create_grobs ()
+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)
@@ -103,9 +101,15 @@ Custos_engraver::create_grobs ()
       for (int i = pitches_.size (); i--;)
 	{
 	  Item *c = create_custos ();
+
+	  int p = pitches_[i].steps ();
+	  SCM c0 = get_property ("middleCPosition");
+	  if (scm_is_number (c0))
+	    p += scm_to_int (c0);
+
 	  
-	  c->set_grob_property ("staff-position",
-			       gh_int2scm (pitches_[i].steps ()));
+	  c->set_property ("staff-position",
+				scm_int2num (p));
 	  
 	}
 
@@ -114,13 +118,12 @@ Custos_engraver::create_grobs ()
 }
 
 Item* 
-Custos_engraver::create_custos()
+Custos_engraver::create_custos ()
 {
-  SCM basicProperties = get_property ("Custos");
-  Item* custos = new Item (basicProperties);
+  Item* custos = make_item ("Custos", SCM_EOL);
   
-  announce_grob (custos, 0);
-  custos_arr_.push (custos);
+  
+  custodes_.push (custos);
   
   return custos;
 }
@@ -128,13 +131,19 @@ 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 ();
     }
-  custos_arr_.clear ();
+  custodes_.clear ();
 }
 
-ADD_THIS_TRANSLATOR (Custos_engraver);
 
+
+ENTER_DESCRIPTION (Custos_engraver,
+/* descr */       "",
+/* creats*/       "Custos",
+/* accepts */     "",
+/* acks  */      "bar-line-interface note-head-interface",
+/* reads */       "",
+/* write */       "");