X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-symbol-engraver.cc;h=4eee00b116dd8f0377dd3a7aa7a5784314714842;hb=cd586e589daa7a550fa39200a78cb2012e853d99;hp=f749d7d007cc099987c738be3e2a7e31534781be;hpb=e7d84e6728ecfdf74d8f214486a29c2aca199819;p=lilypond.git

diff --git a/lily/staff-symbol-engraver.cc b/lily/staff-symbol-engraver.cc
index f749d7d007..4eee00b116 100644
--- a/lily/staff-symbol-engraver.cc
+++ b/lily/staff-symbol-engraver.cc
@@ -1,83 +1,119 @@
 /*
-  staff-sym-reg.cc -- implement Staff_symbol_engraver
+  staff-symbol-engraver.cc -- implement Staff_symbol_engraver
 
   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"
-
-/**
-  Manage the staff symbol.
- */
-class Staff_symbol_engraver : public Engraver { 
-  Staff_symbol *span_p_;
-public:
-  VIRTUAL_COPY_CONS(Translator);
-  Staff_symbol_engraver();
-  
-protected:
-  virtual ~Staff_symbol_engraver();
-
-  virtual void acknowledge_element (Score_element_info);
-  virtual void do_removal_processing();
-  virtual void do_creation_processing();
-	
-};
-
-
-Staff_symbol_engraver::~Staff_symbol_engraver()
+#include "staff-symbol-engraver.hh"
+#include "spanner.hh"
+
+Staff_symbol_engraver::~Staff_symbol_engraver ()
 {
-  assert (!span_p_);
+  assert (!span_);
 }
 
-Staff_symbol_engraver::Staff_symbol_engraver()
+Staff_symbol_engraver::Staff_symbol_engraver ()
 {
-  span_p_ = 0;
+  finished_span_ = 0;
+  first_start_ = true;
+  span_ = 0;
+  span_events_[LEFT] = 0;
+  span_events_[RIGHT] = 0;
 }
 
-void
-Staff_symbol_engraver::do_creation_processing()
+bool
+Staff_symbol_engraver::try_music (Music *music)
 {
-  span_p_ = new Staff_symbol;
-  span_p_->set_bound(LEFT,get_staff_info().command_pcol_l ());
-
-
-  // ugh, should do generic 
-  span_p_->property_alist_ = get_property ("staffSymbolBasicProperties");
-  announce_element (Score_element_info (span_p_, 0));
+  Direction d = to_dir (music->get_property ("span-direction"));
+  if (d)
+    {
+      span_events_[d] = music;
+      return true;
+    }
+
+  return false;
 }
 
 void
-Staff_symbol_engraver::do_removal_processing()
+Staff_symbol_engraver::process_music ()
 {
-  SCM n = get_property ("numberOfStaffLines");
-  SCM ss = get_property ("staffSpace");
+  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 ();
+}
 
-  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);
+void
+Staff_symbol_engraver::start_spanner ()
+{
+  if (!span_)
+    span_ = make_spanner ("StaffSymbol", SCM_EOL);
+}
 
-  span_p_->set_bound(RIGHT,get_staff_info().command_pcol_l ());
-  typeset_element (span_p_);
-  span_p_ =0;
+void
+Staff_symbol_engraver::stop_spanner ()
+{
+  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_element (Score_element_info s)
+Staff_symbol_engraver::stop_translation_timestep ()
 {
-  s.elem_l_->set_elt_pointer ("staff-symbol", span_p_->self_scm_);
-  s.elem_l_->add_dependency (span_p_); // UGH. UGH. UGH 
+  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 ();
 }
 
+void
+Staff_symbol_engraver::finalize ()
+{
+  finished_span_ = span_;
+  span_ = 0;
+  stop_spanner ();
+}
 
-ADD_THIS_TRANSLATOR(Staff_symbol_engraver);
+/*
+  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 */ "");