2003 -> 2004

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

diff --git a/lily/custos-engraver.cc b/lily/custos-engraver.cc
index 6af09938e3dae92472adc174d9b48c68dd53f85c..173fb6720ca755ab975a2142f825493404697820 100644 (file)
--- a/lily/custos-engraver.cc
+++ b/lily/custos-engraver.cc
@@ -3,10 +3,8 @@
 
   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"
@@ -15,11 +13,14 @@
 #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:
@@ -50,21 +51,21 @@ 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 = custodes_.size (); i--;)
     {
       typeset_grob (custodes_[i]);
     }
-  custodes_.clear ();
   pitches_.clear ();
 
   custos_permitted = false;
 }
 
+void
+Custos_engraver::start_translation_timestep ()
+{
+  custodes_.clear ();
+}
+
 
 void
 Custos_engraver::acknowledge_grob (Grob_info info)
@@ -123,8 +124,7 @@ Custos_engraver::process_acknowledged_grobs ()
 Item* 
 Custos_engraver::create_custos ()
 {
-  SCM basicProperties = get_property ("Custos");
-  Item* custos = new Item (basicProperties);
+  Item* custos = make_item ("Custos");
   
   announce_grob(custos, SCM_EOL);
   custodes_.push (custos);
@@ -148,7 +148,7 @@ Custos_engraver::finalize ()
 ENTER_DESCRIPTION(Custos_engraver,
 /* descr */       "",
 /* creats*/       "Custos",
-/* accepts */     "general-music",
+/* accepts */     "",
 /* acks  */      "bar-line-interface note-head-interface",
 /* reads */       "",
 /* write */       "");