release: 1.3.69

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

diff --git a/lily/staff-symbol-engraver.cc b/lily/staff-symbol-engraver.cc
index 6440a5941436b863de259e868c27321f87c6111c..1078870c62b249151cb0d2069a42fff595c371ff 100644 (file)
--- a/lily/staff-symbol-engraver.cc
+++ b/lily/staff-symbol-engraver.cc
@@ -6,7 +6,7 @@
   (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "staff-symbol.hh"
+
 #include "score.hh"
 #include "paper-column.hh"
 #include "paper-def.hh"
@@ -18,18 +18,16 @@
   Manage the staff symbol.
  */
 class Staff_symbol_engraver : public Engraver { 
-  Staff_symbol *span_p_;
+  Spanner *span_p_;
 public:
   VIRTUAL_COPY_CONS(Translator);
   Staff_symbol_engraver();
   
 protected:
   virtual ~Staff_symbol_engraver();
-
   virtual void acknowledge_element (Score_element_info);
   virtual void do_removal_processing();
   virtual void do_creation_processing();
-       
 };
 
 
@@ -46,8 +44,9 @@ Staff_symbol_engraver::Staff_symbol_engraver()
 void
 Staff_symbol_engraver::do_creation_processing()
 {
-  span_p_ = new Staff_symbol (get_property ("staffSymbolBasicProperties"));
-  span_p_->set_bound(LEFT,unsmob_element (get_property ("currentCommandColumn")));
+  span_p_ = new Spanner (get_property ("staffSymbolBasicProperties"));
+  
+  span_p_->set_bound(LEFT, unsmob_element (get_property ("currentCommandColumn")));
 
   announce_element (Score_element_info (span_p_, 0));
 }
@@ -71,7 +70,7 @@ Staff_symbol_engraver::do_removal_processing()
 void
 Staff_symbol_engraver::acknowledge_element (Score_element_info s)
 {
-  s.elem_l_->set_elt_pointer ("staff-symbol", span_p_->self_scm_);
+  s.elem_l_->set_elt_property ("staff-symbol", span_p_->self_scm_);
   s.elem_l_->add_dependency (span_p_); // UGH. UGH. UGH 
 }