release: 1.3.45

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

diff --git a/lily/staff-symbol-engraver.cc b/lily/staff-symbol-engraver.cc
index 9b2575a30fa8cee8efb34044e55cdf40d571ca3e..4bed0bf75264e00da63edfe0fbd094aa1f2112c9 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--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "staff-symbol.hh"
@@ -47,29 +47,22 @@ void
 Staff_symbol_engraver::do_creation_processing()
 {
   span_p_ = new Staff_symbol;
-  span_p_->set_bounds(LEFT,get_staff_info().command_pcol_l ());
+  span_p_->set_bound(LEFT,get_staff_info().command_pcol_l ());
   announce_element (Score_element_info (span_p_, 0));
 }
 
 void
 Staff_symbol_engraver::do_removal_processing()
 {
-  SCM l (get_property ("numberOfStaffLines", 0));
-  if (gh_number_p(l))
-    {
-      span_p_->no_lines_i_ = gh_scm2int (l);
-    }
-
-  SCM sz (get_property ("staffLineLeading", 0));
-  if (gh_number_p(sz))
-    {
-      span_p_->staff_line_leading_f_ = gh_scm2double (sz);
-    }
-  else
-    {
-      span_p_->staff_line_leading_f_ = paper_l ()->get_var ("interline");
-    }
-  span_p_->set_bounds(RIGHT,get_staff_info().command_pcol_l ());
+  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,get_staff_info().command_pcol_l ());
   typeset_element (span_p_);
   span_p_ =0;
 }
@@ -79,14 +72,6 @@ Staff_symbol_engraver::acknowledge_element (Score_element_info s)
 {
   s.elem_l_->set_elt_property ("staff-symbol", span_p_->self_scm_);
   s.elem_l_->add_dependency (span_p_); // UGH. UGH. UGH 
-
-  SCM ss =s.elem_l_->remove_elt_property ("staff-support");
-  if (gh_boolean_p (ss) && gh_scm2bool (ss))
-    {
-      Side_position_interface si (s.elem_l_);
-      if (si.has_interface_b ())
-       si.add_support (span_p_);
-    }
 }