X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-symbol-engraver.cc;h=d4e57955fceb01b030fc7086cf034052dbe62696;hb=18037c60a42e96cf61b13006bb391e3699bdc45e;hp=7e19c900c5534c46328e24c3af9d622c840b87e9;hpb=a6ee9dcd388111e842064a8d46ab06c4897a00d2;p=lilypond.git

diff --git a/lily/staff-symbol-engraver.cc b/lily/staff-symbol-engraver.cc
index 7e19c900c5..d4e57955fc 100644
--- a/lily/staff-symbol-engraver.cc
+++ b/lily/staff-symbol-engraver.cc
@@ -3,33 +3,40 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
-#include "score.hh"
-#include "paper-column.hh"
-#include "paper-def.hh"
-#include "side-position-interface.hh"
 #include "engraver.hh"
-#include "moment.hh"
+#include "international.hh"
+#include "spanner.hh"
+#include "stream-event.hh"
+#include "warn.hh"
 
-/**
-  Manage the staff symbol.
- */
-class Staff_symbol_engraver : public Engraver { 
-  Spanner *span_;
+#include "translator.icc"
+
+class Staff_symbol_engraver : public Engraver
+{
 public:
-  TRANSLATOR_DECLARATIONS(Staff_symbol_engraver);
-  
+  TRANSLATOR_DECLARATIONS (Staff_symbol_engraver);
+
+protected:
+  Drul_array<Stream_event *> span_events_;
+  Spanner *span_;
+  Spanner *finished_span_;
+  bool first_start_;
+
 protected:
+  virtual void start_spanner ();
+  virtual void stop_spanner ();
+
+  void stop_translation_timestep ();
   virtual ~Staff_symbol_engraver ();
-  virtual void acknowledge_grob (Grob_info);
+  DECLARE_ACKNOWLEDGER (grob);
+  DECLARE_TRANSLATOR_LISTENER (staff_span);
   virtual void finalize ();
-  virtual void initialize ();
+  void process_music ();
 };
 
-
 Staff_symbol_engraver::~Staff_symbol_engraver ()
 {
   assert (!span_);
@@ -37,43 +44,113 @@ 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;
 }
 
+IMPLEMENT_TRANSLATOR_LISTENER (Staff_symbol_engraver, staff_span);
 void
-Staff_symbol_engraver::initialize ()
+Staff_symbol_engraver::listen_staff_span (Stream_event *ev)
 {
-  span_ = new Spanner (get_property ("StaffSymbol"));
-  
-  span_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
+  Direction d = to_dir (ev->get_property ("span-direction"));
+  if (d)
+    span_events_[d] = ev;
+  else
+    programming_error (_ ("staff-span event has no direction"));
+}
 
-  announce_grob(span_, SCM_EOL);
+void
+Staff_symbol_engraver::process_music ()
+{
+  if (span_events_[STOP])
+    {
+      finished_span_ = span_;
+      span_ = 0;
+      if (first_start_)
+	first_start_ = false;
+    }
+
+  if (span_events_[START]
+      || (first_start_ && !span_events_[STOP]))
+    start_spanner ();
 }
 
 void
-Staff_symbol_engraver::finalize ()
+Staff_symbol_engraver::start_spanner ()
 {
-  span_->set_bound (RIGHT,unsmob_grob (get_property ("currentCommandColumn")));
-  typeset_grob (span_);
-  span_ =0;
+  if (!span_)
+    {
+      span_ = make_spanner ("StaffSymbol", SCM_EOL);
+      span_->set_bound (LEFT,
+			unsmob_grob (get_property ("currentCommandColumn")));
+    }
 }
 
 void
-Staff_symbol_engraver::acknowledge_grob (Grob_info s)
+Staff_symbol_engraver::stop_spanner ()
 {
-  s.grob_->set_grob_property ("staff-symbol", span_->self_scm ());
+  if (!finished_span_)
+    return;
 
-  // remove this. probly not necessary?
-  s.grob_->add_dependency (span_); // UGH. UGH. UGH
+  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;
 }
 
+void
+Staff_symbol_engraver::stop_translation_timestep ()
+{
+  if ((span_events_[START] || first_start_)
+      && span_)
+    {
+      first_start_ = false;
+    }
+
+  span_events_[START] = 0;
+  span_events_[STOP] = 0;
+  stop_spanner ();
+}
 
+void
+Staff_symbol_engraver::finalize ()
+{
+  finished_span_ = span_;
+  span_ = 0;
+  stop_spanner ();
+}
+
+/*
+  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 ());
+    }
+}
 
+ADD_ACKNOWLEDGER (Staff_symbol_engraver, grob);
 
-ENTER_DESCRIPTION(Staff_symbol_engraver,
-/* descr */       "create the constellation of five (default)
-staff lines.",
-/* creats*/       "StaffSymbol",
-/* acks  */       "grob-interface",
-/* reads */       "",
-/* write */       "");
+ADD_TRANSLATOR (Staff_symbol_engraver,
+		/* doc */ "Create the constellation of five (default) "
+		"staff lines.",
+		/* create */ "StaffSymbol",
+		/* accept */ "staff-span-event",
+		/* read */ "",
+		/* write */ "");