X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-symbol-engraver.cc;h=11f14ea1c6040dbbd5c544a777b9c066a2d0414b;hb=c08b39b3b6d45d7517c69cc7d28442c4bcdcc789;hp=a103eda0b39fe963805833bf249a572c9fc19b69;hpb=a6bd229f7fe1dc4a03478e14ccc0c0c66b225061;p=lilypond.git

diff --git a/lily/staff-symbol-engraver.cc b/lily/staff-symbol-engraver.cc
index a103eda0b3..11f14ea1c6 100644
--- a/lily/staff-symbol-engraver.cc
+++ b/lily/staff-symbol-engraver.cc
@@ -58,8 +58,7 @@ Staff_symbol_engraver::Staff_symbol_engraver ()
   finished_span_ = 0;
   first_start_ = true;
   span_ = 0;
-  span_events_[LEFT] = 0;
-  span_events_[RIGHT] = 0;
+  span_events_.set (0, 0);
 }
 
 IMPLEMENT_TRANSLATOR_LISTENER (Staff_symbol_engraver, staff_span);
@@ -70,7 +69,7 @@ Staff_symbol_engraver::listen_staff_span (Stream_event *ev)
   if (d)
     ASSIGN_EVENT_ONCE (span_events_[d], ev);
   else
-    programming_error (_ ("staff-span event has no direction"));
+    programming_error ("staff-span event has no direction");
 }
 
 void
@@ -108,12 +107,12 @@ Staff_symbol_engraver::stop_spanner ()
 
   if (!finished_span_->get_bound (RIGHT))
     finished_span_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn")));
-  
+
   announce_end_grob (finished_span_,
 		     span_events_[STOP]
 		     ? span_events_[STOP]->self_scm ()
 		     : SCM_EOL);
-  
+
   finished_span_ = 0;
 }
 
@@ -122,12 +121,9 @@ Staff_symbol_engraver::stop_translation_timestep ()
 {
   if ((span_events_[START] || first_start_)
       && span_)
-    {
-      first_start_ = false;
-    }
+    first_start_ = false;
 
-  span_events_[START] = 0;
-  span_events_[STOP] = 0;
+  span_events_.set (0, 0);
   stop_spanner ();
 }
 
@@ -145,10 +141,6 @@ Staff_symbol_engraver::finalize ()
 void
 Staff_symbol_engraver::acknowledge_grob (Grob_info s)
 {
-  /*
-    Perhaps should try to take SeparationItem as bound of the staff
-    symbol?
-  */
   if (span_ || finished_span_)
     {
       Spanner *my = span_ ? span_ : finished_span_;