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 8245bbf8e59a5749838f46b23ae4f945387c4df2..4eee00b116dd8f0377dd3a7aa7a5784314714842 100644 (file)
--- a/lily/staff-symbol-engraver.cc
+++ b/lily/staff-symbol-engraver.cc
@@ -3,33 +3,11 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
-#include "score.hh"
-#include "paper-column.hh"
-#include "output-def.hh"
-#include "side-position-interface.hh"
-#include "engraver.hh"
-#include "moment.hh"
-
-/**
-  Manage the staff symbol.
- */
-class Staff_symbol_engraver : public Engraver { 
-public:
-  TRANSLATOR_DECLARATIONS (Staff_symbol_engraver);
-  
-protected:
-  Spanner *span_;
-  
-  virtual ~Staff_symbol_engraver ();
-  virtual void acknowledge_grob (Grob_info);
-  virtual void finalize ();
-  virtual void process_music ();
-};
-
+#include "staff-symbol-engraver.hh"
+#include "spanner.hh"
 
 Staff_symbol_engraver::~Staff_symbol_engraver ()
 {
@@ -38,83 +16,104 @@ Staff_symbol_engraver::~Staff_symbol_engraver ()
 
 Staff_symbol_engraver::Staff_symbol_engraver ()
 {
+  finished_span_ = 0;
+  first_start_ = true;
   span_ = 0;
+  span_events_[LEFT] = 0;
+  span_events_[RIGHT] = 0;
 }
 
-void
-Staff_symbol_engraver::process_music ()
+bool
+Staff_symbol_engraver::try_music (Music *music)
 {
-  if (!span_)
+  Direction d = to_dir (music->get_property ("span-direction"));
+  if (d)
     {
-      span_ = make_spanner ("StaffSymbol", SCM_EOL);
-  
-      span_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
-
-      
+      span_events_[d] = music;
+      return true;
     }
+
+  return false;
 }
 
 void
-Staff_symbol_engraver::finalize ()
+Staff_symbol_engraver::process_music ()
 {
-  if (span_)
+  if (span_events_[STOP])
     {
-      span_->set_bound (RIGHT,unsmob_grob (get_property ("currentCommandColumn")));
+      finished_span_ = span_;
+      span_ = 0;
+      if (first_start_)
+       first_start_ = false;
     }
-  span_ = 0;
+
+  if (span_events_[START]
+      || (first_start_ && !span_events_[STOP]))
+    start_spanner ();
 }
 
 void
-Staff_symbol_engraver::acknowledge_grob (Grob_info s)
+Staff_symbol_engraver::start_spanner ()
 {
-  s.grob_->set_property ("staff-symbol", span_->self_scm ());
+  if (!span_)
+    span_ = make_spanner ("StaffSymbol", SCM_EOL);
 }
 
-
-
-
-ADD_TRANSLATOR (Staff_symbol_engraver,
-/* descr */       "Create the constellation of five (default) "
-"staff lines.",
-/* creats*/       "StaffSymbol",
-/* accepts */     "",
-/* acks  */      "grob-interface",
-/* reads */       "",
-/* write */       "");
-
-/****************************************************************/
-
-
-class Tab_staff_symbol_engraver : public Staff_symbol_engraver
+void
+Staff_symbol_engraver::stop_spanner ()
 {
-public:
-  TRANSLATOR_DECLARATIONS (Tab_staff_symbol_engraver);
-protected:
-  virtual void process_music ();
-};
+  if (finished_span_ && !finished_span_->get_bound (RIGHT))
+    finished_span_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn")));
+  finished_span_ = 0;
+}
 
 void
-Tab_staff_symbol_engraver::process_music ()
+Staff_symbol_engraver::stop_translation_timestep ()
 {
-  bool init = !span_;
-  Staff_symbol_engraver::process_music ();
-  if (init)
+  if ((span_events_[START] || first_start_)
+      && span_
+      && !span_->get_bound (LEFT))
     {
-      int k = scm_ilength (get_property ("stringTunings"));
-      if (k>= 0)
-       span_->set_property ("line-count", scm_int2num (k));
+      span_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
+      first_start_ = false;
     }
+
+  span_events_[START] = 0;
+  span_events_[STOP] = 0;
+  stop_spanner ();
 }
 
-Tab_staff_symbol_engraver::Tab_staff_symbol_engraver ()
+void
+Staff_symbol_engraver::finalize ()
 {
+  finished_span_ = span_;
+  span_ = 0;
+  stop_spanner ();
 }
 
-ADD_TRANSLATOR (Tab_staff_symbol_engraver,
-/* descr */       "Create a staff-symbol, but look at stringTunings for the number of lines."
-"staff lines.",
-/* creats*/       "StaffSymbol",
-/* accepts */     "",
-/* acks  */      "grob-interface",
-/* reads */       "stringTunings",
-/* write */       "");
+/*
+  Todo: staff-symbol-referencer iface.
+*/
+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_;
+      s.grob ()->set_object ("staff-symbol", my->self_scm ());
+    }
+}
+
+#include "translator.icc"
+ADD_ACKNOWLEDGER (Staff_symbol_engraver, grob);
+ADD_TRANSLATOR (Staff_symbol_engraver,
+               /* doc */ "Create the constellation of five (default) "
+               "staff lines.",
+               /* create */ "StaffSymbol",
+               /* accept */ "staff-span-event",
+               /* read */ "",
+               /* write */ "");