Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/staff-symbol-engraver.cc b/lily/staff-symbol-engraver.cc
index c147d54dfff9bd1f7430c1ab5959bd21c4c12ca2..4eee00b116dd8f0377dd3a7aa7a5784314714842 100644 (file)
--- a/lily/staff-symbol-engraver.cc
+++ b/lily/staff-symbol-engraver.cc
@@ -6,31 +6,8 @@
   (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 ()
 {
@@ -79,27 +56,14 @@ void
 Staff_symbol_engraver::start_spanner ()
 {
   if (!span_)
-    {
-      span_ = make_spanner ("StaffSymbol", SCM_EOL);
-      span_->set_bound (LEFT,
-                       unsmob_grob (get_property ("currentCommandColumn")));
-    }
+    span_ = make_spanner ("StaffSymbol", SCM_EOL);
 }
 
 void
 Staff_symbol_engraver::stop_spanner ()
 {
-  if (!finished_span_)
-    return;
-
-  if (!finished_span_->get_bound (RIGHT))
+  if (finished_span_ && !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;
 }
 
@@ -107,8 +71,10 @@ void
 Staff_symbol_engraver::stop_translation_timestep ()
 {
   if ((span_events_[START] || first_start_)
-      && span_)
+      && span_
+      && !span_->get_bound (LEFT))
     {
+      span_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
       first_start_ = false;
     }
 
@@ -143,9 +109,7 @@ 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.",