release: 0.1.48

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

diff --git a/lily/staff-sym-grav.cc b/lily/staff-sym-grav.cc
index 5aff3e35361da0db1b190a882a4b403fb5800eb6..6aab67dece77bedede5aad66926fbfeba04c4183 100644 (file)
--- a/lily/staff-sym-grav.cc
+++ b/lily/staff-sym-grav.cc
@@ -11,16 +11,16 @@
 #include "score.hh"
 #include "p-col.hh"
 
-const NO_LINES = 5;
+
 void
 Staff_sym_engraver::fill_staff_info (Staff_info&i)
 {
-    i.staff_sym_l_ = span_p_;
+  i.staff_sym_l_ = span_p_;
 }
 
 Staff_sym_engraver::~Staff_sym_engraver()
 {
-    assert (!span_p_);
+  assert (!span_p_);
 }
 
 Staff_sym_engraver::Staff_sym_engraver()
@@ -31,20 +31,26 @@ 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
-    announce_element (Score_elem_info (span_p_, 0));
+  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 ();
-    typeset_element (span_p_);
-    span_p_ =0;
+  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;
 }
 
 
 
 IMPLEMENT_IS_TYPE_B1(Staff_sym_engraver,Engraver);
-ADD_THIS_ENGRAVER(Staff_sym_engraver);
+ADD_THIS_TRANSLATOR(Staff_sym_engraver);