X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-symbol-engraver.cc;h=242e06e46a7439be625778c02bc3feb0aa51d6e8;hb=cf4b1202d9f3d891a98ebab7d5df0d5cfb7f8ad8;hp=6440a5941436b863de259e868c27321f87c6111c;hpb=b638d530ac5a32a832646cdd2b680ce52d0764f0;p=lilypond.git

diff --git a/lily/staff-symbol-engraver.cc b/lily/staff-symbol-engraver.cc
index 6440a59414..242e06e46a 100644
--- a/lily/staff-symbol-engraver.cc
+++ b/lily/staff-symbol-engraver.cc
@@ -3,78 +3,154 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "staff-symbol.hh"
-#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 { 
-  Staff_symbol *span_p_;
+#include "translator.icc"
+
+class Staff_symbol_engraver : public Engraver
+{
 public:
-  VIRTUAL_COPY_CONS(Translator);
-  Staff_symbol_engraver();
-  
+  TRANSLATOR_DECLARATIONS (Staff_symbol_engraver);
+
 protected:
-  virtual ~Staff_symbol_engraver();
+  Drul_array<Stream_event *> span_events_;
+  Spanner *span_;
+  Spanner *finished_span_;
+  bool first_start_;
 
-  virtual void acknowledge_element (Score_element_info);
-  virtual void do_removal_processing();
-  virtual void do_creation_processing();
-	
+protected:
+  virtual void start_spanner ();
+  virtual void stop_spanner ();
+
+  void stop_translation_timestep ();
+  virtual ~Staff_symbol_engraver ();
+  DECLARE_ACKNOWLEDGER (grob);
+  DECLARE_TRANSLATOR_LISTENER (staff_span);
+  virtual void finalize ();
+  void process_music ();
 };
 
+Staff_symbol_engraver::~Staff_symbol_engraver ()
+{
+  assert (!span_);
+}
 
-Staff_symbol_engraver::~Staff_symbol_engraver()
+Staff_symbol_engraver::Staff_symbol_engraver ()
 {
-  assert (!span_p_);
+  finished_span_ = 0;
+  first_start_ = true;
+  span_ = 0;
+  span_events_[LEFT] = 0;
+  span_events_[RIGHT] = 0;
 }
 
-Staff_symbol_engraver::Staff_symbol_engraver()
+IMPLEMENT_TRANSLATOR_LISTENER (Staff_symbol_engraver, staff_span);
+void
+Staff_symbol_engraver::listen_staff_span (Stream_event *ev)
 {
-  span_p_ = 0;
+  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::do_creation_processing()
+Staff_symbol_engraver::process_music ()
 {
-  span_p_ = new Staff_symbol (get_property ("staffSymbolBasicProperties"));
-  span_p_->set_bound(LEFT,unsmob_element (get_property ("currentCommandColumn")));
+  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 ();
+}
 
-  announce_element (Score_element_info (span_p_, 0));
+void
+Staff_symbol_engraver::start_spanner ()
+{
+  if (!span_)
+    {
+      span_ = make_spanner ("StaffSymbol", SCM_EOL);
+      span_->set_bound (LEFT,
+			unsmob_grob (get_property ("currentCommandColumn")));
+    }
 }
 
 void
-Staff_symbol_engraver::do_removal_processing()
+Staff_symbol_engraver::stop_spanner ()
 {
-  SCM n = get_property ("numberOfStaffLines");
-  SCM ss = get_property ("staffSpace");
+  if (!finished_span_)
+    return;
 
-  if (gh_number_p (ss))
-    span_p_->set_elt_property ("staff-space", ss);
-  if (gh_number_p (n))
-    span_p_->set_elt_property ("line-count", n);
+  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;
+}
 
-  span_p_->set_bound(RIGHT,unsmob_element (get_property ("currentCommandColumn")));
-  typeset_element (span_p_);
-  span_p_ =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::acknowledge_element (Score_element_info s)
+Staff_symbol_engraver::finalize ()
 {
-  s.elem_l_->set_elt_pointer ("staff-symbol", span_p_->self_scm_);
-  s.elem_l_->add_dependency (span_p_); // UGH. UGH. UGH 
+  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_THIS_TRANSLATOR(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",
+		/* accept */ "staff-span-event",
+		/* read */ "",
+		/* write */ "");