X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-symbol-engraver.cc;h=61d3955384daa1ff2695e5890c9283f1b6262765;hb=205203e856ba125f43b9caa66fc7177db16a6db9;hp=1686426734d3fca1690851599bc85215ba51622b;hpb=df4a7c4a55148e065d878dcc2f7e09ac27ea9c32;p=lilypond.git

diff --git a/lily/staff-symbol-engraver.cc b/lily/staff-symbol-engraver.cc
index 1686426734..61d3955384 100644
--- a/lily/staff-symbol-engraver.cc
+++ b/lily/staff-symbol-engraver.cc
@@ -3,71 +3,119 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
+#include "staff-symbol-engraver.hh"
+#include "spanner.hh"
 
-#include "score.hh"
-#include "paper-column.hh"
-#include "paper-def.hh"
-#include "side-position-interface.hh"
-#include "engraver.hh"
-#include "moment.hh"
-
-/**
-  Manage the staff symbol.
- */
-class Staff_symbol_engraver : public Engraver { 
-  Spanner *span_p_;
-public:
-  VIRTUAL_COPY_CONS(Translator);
-  Staff_symbol_engraver();
-  
-protected:
-  virtual ~Staff_symbol_engraver();
-  virtual void acknowledge_grob (Grob_info);
-  virtual void do_removal_processing();
-  virtual void do_creation_processing();
-};
+Staff_symbol_engraver::~Staff_symbol_engraver ()
+{
+  assert (!span_);
+}
 
+Staff_symbol_engraver::Staff_symbol_engraver ()
+{
+  finished_span_ = 0;
+  first_start_ = true; 
+  span_ = 0;
+  span_events_[LEFT] = 0;
+  span_events_[RIGHT] = 0;
+}
 
-Staff_symbol_engraver::~Staff_symbol_engraver()
+bool
+Staff_symbol_engraver::try_music (Music *music)
 {
-  assert (!span_p_);
+  Direction d = to_dir (music->get_property ("span-direction"));
+  if (d)
+    {
+      span_events_[d] = music;
+      return true;
+    }
+  
+  return false;
 }
 
-Staff_symbol_engraver::Staff_symbol_engraver()
+void
+Staff_symbol_engraver::process_music ()
 {
-  span_p_ = 0;
+  if (span_events_[STOP])
+    {
+      finished_span_ = span_;
+      span_ = 0;
+    }
+
+  if (span_events_[START])
+    start_spanner ();
 }
 
+
 void
-Staff_symbol_engraver::do_creation_processing()
+Staff_symbol_engraver::initialize ()
 {
-  span_p_ = new Spanner (get_property ("StaffSymbol"));
-  
-  span_p_->set_bound(LEFT, unsmob_element (get_property ("currentCommandColumn")));
+  start_spanner ();
+}
 
-  announce_grob (span_p_, 0);
+void
+Staff_symbol_engraver::start_spanner ()
+{
+  if (!span_)
+    {
+      span_ = make_spanner ("StaffSymbol", SCM_EOL);
+    }
 }
 
 void
-Staff_symbol_engraver::do_removal_processing()
+Staff_symbol_engraver::stop_spanner ()
 {
-  span_p_->set_bound(RIGHT,unsmob_element (get_property ("currentCommandColumn")));
-  typeset_grob (span_p_);
-  span_p_ =0;
+  if (finished_span_ && !finished_span_->get_bound (RIGHT))
+    {
+      finished_span_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn")));
+    }
+  finished_span_ = 0;
 }
 
 void
-Staff_symbol_engraver::acknowledge_grob (Grob_info s)
+Staff_symbol_engraver::stop_translation_timestep ()
 {
-  s.elem_l_->set_grob_property ("staff-symbol", span_p_->self_scm ());
+  if ((span_events_[START] || first_start_)
+      && span_
+      && !span_->get_bound (LEFT))
+    {
+      span_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
+      first_start_ = false;
+    }
+
+  span_events_[START] = 0;
+  span_events_[STOP] = 0;
+  stop_spanner ();
+}
 
-  // remove this. probly not necessary?
-  s.elem_l_->add_dependency (span_p_); // UGH. UGH. UGH
+void
+Staff_symbol_engraver::finalize ()
+{
+  finished_span_ = span_;
+  span_ = 0;
+  stop_spanner ();
 }
 
+void
+Staff_symbol_engraver::acknowledge_grob (Grob_info s)
+{
 
-ADD_THIS_TRANSLATOR(Staff_symbol_engraver);
+  /*
+    Perhaps should try to take SeparationItem as bound of the staff
+    symbol?
+   */
+  if (span_)
+    s.grob ()->set_property ("staff-symbol", span_->self_scm ());
+}
 
+ADD_TRANSLATOR (Staff_symbol_engraver,
+		/* descr */ "Create the constellation of five (default) "
+		"staff lines.",
+		/* creats*/ "StaffSymbol",
+		/* accepts */ "staff-span-event",
+		/* acks  */ "grob-interface",
+		/* reads */ "",
+		/* write */ "");