2003 -> 2004

[lilypond.git] / lily / staff-symbol-engraver.cc

diff --git a/lily/staff-symbol-engraver.cc b/lily/staff-symbol-engraver.cc
index c1a27bcd1794dffe379e5a1bfb5d2781c1b4b353..d71dcb4f2121cb2543ce394258a8dd437b5f24a3 100644 (file)
--- a/lily/staff-symbol-engraver.cc
+++ b/lily/staff-symbol-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -18,56 +18,69 @@
   Manage the staff symbol.
  */
 class Staff_symbol_engraver : public Engraver { 
-  Spanner *span_p_;
+  Spanner *span_;
 public:
-  VIRTUAL_COPY_CONS (Translator);
-  Staff_symbol_engraver ();
+  TRANSLATOR_DECLARATIONS(Staff_symbol_engraver);
   
 protected:
   virtual ~Staff_symbol_engraver ();
   virtual void acknowledge_grob (Grob_info);
   virtual void finalize ();
-  virtual void initialize ();
+  virtual void process_music ();
 };
 
 
 Staff_symbol_engraver::~Staff_symbol_engraver ()
 {
-  assert (!span_p_);
+  assert (!span_);
 }
 
 Staff_symbol_engraver::Staff_symbol_engraver ()
 {
-  span_p_ = 0;
+  span_ = 0;
 }
 
 void
-Staff_symbol_engraver::initialize ()
+Staff_symbol_engraver::process_music ()
 {
-  span_p_ = new Spanner (get_property ("StaffSymbol"));
+  if (!span_)
+    {
+      span_ = make_spanner ("StaffSymbol");
   
-  span_p_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
+      span_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
 
-  announce_grob (span_p_, 0);
+      announce_grob(span_, SCM_EOL);
+    }
 }
 
 void
 Staff_symbol_engraver::finalize ()
 {
-  span_p_->set_bound (RIGHT,unsmob_grob (get_property ("currentCommandColumn")));
-  typeset_grob (span_p_);
-  span_p_ =0;
+  if (span_)
+    {
+      span_->set_bound (RIGHT,unsmob_grob (get_property ("currentCommandColumn")));
+      typeset_grob (span_);
+    }
+  span_ =0;
 }
 
 void
 Staff_symbol_engraver::acknowledge_grob (Grob_info s)
 {
-  s.elem_l_->set_grob_property ("staff-symbol", span_p_->self_scm ());
+  s.grob_->set_grob_property ("staff-symbol", span_->self_scm ());
 
   // remove this. probly not necessary?
-  s.elem_l_->add_dependency (span_p_); // UGH. UGH. UGH
+  s.grob_->add_dependency (span_); // UGH. UGH. UGH
 }
 
 
-ADD_THIS_TRANSLATOR (Staff_symbol_engraver);
 
+
+ENTER_DESCRIPTION(Staff_symbol_engraver,
+/* descr */       "create the constellation of five (default) "
+"staff lines.",
+/* creats*/       "StaffSymbol",
+/* accepts */     "",
+/* acks  */      "grob-interface",
+/* reads */       "",
+/* write */       "");