* lily/translator-group.cc (connect_to_context): non const error message.

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

diff --git a/lily/staff-symbol-engraver.cc b/lily/staff-symbol-engraver.cc
index 971c49bdfa30f3838bcb86f451f8298babaf3f9e..c147d54dfff9bd1f7430c1ab5959bd21c4c12ca2 100644 (file)
--- a/lily/staff-symbol-engraver.cc
+++ b/lily/staff-symbol-engraver.cc
@@ -3,11 +3,34 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "staff-symbol-engraver.hh"
 #include "spanner.hh"
+#include "engraver.hh"
+
+class Staff_symbol_engraver : public Engraver
+{
+public:
+  TRANSLATOR_DECLARATIONS (Staff_symbol_engraver);
+
+protected:
+  Drul_array<Music *> span_events_;
+  Spanner *span_;
+  Spanner *finished_span_;
+  bool first_start_;
+
+protected:
+  virtual void start_spanner ();
+  virtual void stop_spanner ();
+
+  void stop_translation_timestep ();
+  virtual bool try_music (Music *);
+  virtual ~Staff_symbol_engraver ();
+  DECLARE_ACKNOWLEDGER (grob);
+  virtual void finalize ();
+  void process_music ();
+};
 
 Staff_symbol_engraver::~Staff_symbol_engraver ()
 {
@@ -43,6 +66,8 @@ Staff_symbol_engraver::process_music ()
     {
       finished_span_ = span_;
       span_ = 0;
+      if (first_start_)
+       first_start_ = false;
     }
 
   if (span_events_[START]
@@ -54,14 +79,27 @@ void
 Staff_symbol_engraver::start_spanner ()
 {
   if (!span_)
-    span_ = make_spanner ("StaffSymbol", SCM_EOL);
+    {
+      span_ = make_spanner ("StaffSymbol", SCM_EOL);
+      span_->set_bound (LEFT,
+                       unsmob_grob (get_property ("currentCommandColumn")));
+    }
 }
 
 void
 Staff_symbol_engraver::stop_spanner ()
 {
-  if (finished_span_ && !finished_span_->get_bound (RIGHT))
+  if (!finished_span_)
+    return;
+
+  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;
 }
 
@@ -69,10 +107,8 @@ void
 Staff_symbol_engraver::stop_translation_timestep ()
 {
   if ((span_events_[START] || first_start_)
-      && span_
-      && !span_->get_bound (LEFT))
+      && span_)
     {
-      span_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
       first_start_ = false;
     }
 
@@ -107,7 +143,9 @@ Staff_symbol_engraver::acknowledge_grob (Grob_info s)
 }
 
 #include "translator.icc"
+
 ADD_ACKNOWLEDGER (Staff_symbol_engraver, grob);
+
 ADD_TRANSLATOR (Staff_symbol_engraver,
                /* doc */ "Create the constellation of five (default) "
                "staff lines.",