patch::: 1.3.136.jcn3

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

diff --git a/lily/staff-symbol-engraver.cc b/lily/staff-symbol-engraver.cc
index 2917e16a45ca21607a9bcb9a074a4839cc90f6b4..c1a27bcd1794dffe379e5a1bfb5d2781c1b4b353 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--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -20,60 +20,54 @@
 class Staff_symbol_engraver : public Engraver { 
   Spanner *span_p_;
 public:
-  VIRTUAL_COPY_CONS(Translator);
-  Staff_symbol_engraver();
+  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();
+  virtual ~Staff_symbol_engraver ();
+  virtual void acknowledge_grob (Grob_info);
+  virtual void finalize ();
+  virtual void initialize ();
 };
 
 
-Staff_symbol_engraver::~Staff_symbol_engraver()
+Staff_symbol_engraver::~Staff_symbol_engraver ()
 {
   assert (!span_p_);
 }
 
-Staff_symbol_engraver::Staff_symbol_engraver()
+Staff_symbol_engraver::Staff_symbol_engraver ()
 {
   span_p_ = 0;
 }
 
 void
-Staff_symbol_engraver::do_creation_processing()
+Staff_symbol_engraver::initialize ()
 {
-  span_p_ = new Spanner (get_property ("basicStaffSymbolProperties"));
+  span_p_ = new Spanner (get_property ("StaffSymbol"));
   
-  span_p_->set_bound(LEFT, unsmob_element (get_property ("currentCommandColumn")));
+  span_p_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
 
-  announce_element (span_p_, 0);
+  announce_grob (span_p_, 0);
 }
 
 void
-Staff_symbol_engraver::do_removal_processing()
+Staff_symbol_engraver::finalize ()
 {
-  SCM n = get_property ("numberOfStaffLines");
-  SCM ss = get_property ("staffSpace");
-
-  if (gh_number_p (ss))
-    span_p_->set_elt_property ("staff-space", ss);
-  if (gh_number_p (n))
-    span_p_->set_elt_property ("line-count", n);
-
-  span_p_->set_bound(RIGHT,unsmob_element (get_property ("currentCommandColumn")));
-  typeset_element (span_p_);
+  span_p_->set_bound (RIGHT,unsmob_grob (get_property ("currentCommandColumn")));
+  typeset_grob (span_p_);
   span_p_ =0;
 }
 
 void
-Staff_symbol_engraver::acknowledge_element (Score_element_info s)
+Staff_symbol_engraver::acknowledge_grob (Grob_info s)
 {
-  s.elem_l_->set_elt_property ("staff-symbol", span_p_->self_scm ());
-  s.elem_l_->add_dependency (span_p_); // UGH. UGH. UGH 
+  s.elem_l_->set_grob_property ("staff-symbol", span_p_->self_scm ());
+
+  // remove this. probly not necessary?
+  s.elem_l_->add_dependency (span_p_); // UGH. UGH. UGH
 }
 
 
-ADD_THIS_TRANSLATOR(Staff_symbol_engraver);
+ADD_THIS_TRANSLATOR (Staff_symbol_engraver);