partial: 1.0.1.jcn

[lilypond.git] / lily / staff-sym-grav.cc

diff --git a/lily/staff-sym-grav.cc b/lily/staff-sym-grav.cc
index 6adfae18269039cca7e76e48be5c0480518cba73..2e09bb5777ba6ab40b651afa8063fd791f8333f4 100644 (file)
--- a/lily/staff-sym-grav.cc
+++ b/lily/staff-sym-grav.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>
 */
 
 #include "staff-sym-grav.hh"
@@ -11,7 +11,7 @@
 #include "score.hh"
 #include "p-col.hh"
 
-const NO_LINES = 5;
+
 void
 Staff_sym_engraver::fill_staff_info (Staff_info&i)
 {
@@ -31,15 +31,21 @@ Staff_sym_engraver::Staff_sym_engraver()
 void
 Staff_sym_engraver::do_creation_processing()
 {
-  span_p_ = new Staff_symbol (NO_LINES);
-  span_p_->left_col_l_ = get_staff_info().command_pcol_l (); // ugh
+  span_p_ = new Staff_symbol;
+  span_p_->set_bounds(LEFT,get_staff_info().command_pcol_l ());
   announce_element (Score_elem_info (span_p_, 0));
 }
 
 void
 Staff_sym_engraver::do_removal_processing()
 {
-  span_p_->right_col_l_ = get_staff_info().command_pcol_l ();
+  Scalar l (get_property ("nolines"));
+  if (l.isnum_b ())
+    {
+      span_p_->no_lines_i_ = l;
+    }
+
+  span_p_->set_bounds(RIGHT,get_staff_info().command_pcol_l ());
   typeset_element (span_p_);
   span_p_ =0;
 }
@@ -47,4 +53,4 @@ Staff_sym_engraver::do_removal_processing()
 
 
 IMPLEMENT_IS_TYPE_B1(Staff_sym_engraver,Engraver);
-ADD_THIS_ENGRAVER(Staff_sym_engraver);
+ADD_THIS_TRANSLATOR(Staff_sym_engraver);