X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-symbol-engraver.cc;h=12bdfe24461670abf2fee90ac18e109646e11f18;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=fe813adc0a3209effd8c2dee75079f3d5c54d6ae;hpb=664070d837cc4855091455892cb942cdcedeef0c;p=lilypond.git

diff --git a/lily/staff-symbol-engraver.cc b/lily/staff-symbol-engraver.cc
index fe813adc0a..12bdfe2446 100644
--- a/lily/staff-symbol-engraver.cc
+++ b/lily/staff-symbol-engraver.cc
@@ -3,34 +3,40 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 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"
+#include "international.hh"
+#include "spanner.hh"
+#include "stream-event.hh"
+#include "warn.hh"
+
+#include "translator.icc"
 
-/**
-  Manage the staff symbol.
- */
-class Staff_symbol_engraver : public Engraver { 
+class Staff_symbol_engraver : public Engraver
+{
 public:
   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 process_music ();
+  void process_music ();
 };
 
-
 Staff_symbol_engraver::~Staff_symbol_engraver ()
 {
   assert (!span_);
@@ -38,86 +44,119 @@ 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::listen_staff_span (Stream_event *ev)
+{
+  Direction d = to_dir (ev->get_property ("span-direction"));
+  if (d)
+    ASSIGN_EVENT_ONCE (span_events_[d], ev);
+  else
+    programming_error (_ ("staff-span event has no direction"));
 }
 
 void
 Staff_symbol_engraver::process_music ()
 {
-  if (!span_)
+  if (span_events_[STOP])
     {
-      span_ = make_spanner ("StaffSymbol", SCM_EOL);
-  
-      span_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
-
-      
+      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 ()
 {
-  if (span_)
+  if (!span_)
     {
-      span_->set_bound (RIGHT,unsmob_grob (get_property ("currentCommandColumn")));
+      span_ = make_spanner ("StaffSymbol", SCM_EOL);
+      span_->set_bound (LEFT,
+			unsmob_grob (get_property ("currentCommandColumn")));
     }
-  span_ =0;
 }
 
 void
-Staff_symbol_engraver::acknowledge_grob (Grob_info s)
+Staff_symbol_engraver::stop_spanner ()
 {
-  s.grob_->set_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 ();
+}
 
-
-ENTER_DESCRIPTION (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::finalize ()
 {
-public:
-  TRANSLATOR_DECLARATIONS (Tab_staff_symbol_engraver);
-protected:
-  virtual void process_music ();
-};
+  finished_span_ = span_;
+  span_ = 0;
+  stop_spanner ();
+}
 
+/*
+  Todo: staff-symbol-referencer iface.
+*/
 void
-Tab_staff_symbol_engraver::process_music ()
+Staff_symbol_engraver::acknowledge_grob (Grob_info s)
 {
-  bool init = !span_;
-  Staff_symbol_engraver::process_music ();
-  if (init)
+  /*
+    Perhaps should try to take SeparationItem as bound of the staff
+    symbol?
+  */
+  if (span_ || finished_span_)
     {
-      int k = scm_ilength (get_property ("stringTunings"));
-      if (k>=0)
-	span_->set_property ("line-count", scm_int2num (k));
+      Spanner *my = span_ ? span_ : finished_span_;
+      s.grob ()->set_object ("staff-symbol", my->self_scm ());
     }
 }
 
-Tab_staff_symbol_engraver::Tab_staff_symbol_engraver ()
-{
-}
+ADD_ACKNOWLEDGER (Staff_symbol_engraver, grob);
+
+ADD_TRANSLATOR (Staff_symbol_engraver,
+		/* doc */
+		"Create the constellation of five (default) staff lines.",
+
+		/* create */
+		"StaffSymbol ",
+
+		/* read */
+		"",
 
-ENTER_DESCRIPTION (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 */       "");
+		/* write */
+		""
+		);