X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-symbol-engraver.cc;h=974c5ae1ebd1af643033a76607080882766dd278;hb=3e07faa176c300184b2e41d0dcfa779360519359;hp=eb32b20db08c916033bf6fff5ca53f6716fb880d;hpb=ffe548cfbb3c3b37c8969f49b5aba04ef998d080;p=lilypond.git

diff --git a/lily/staff-symbol-engraver.cc b/lily/staff-symbol-engraver.cc
index eb32b20db0..974c5ae1eb 100644
--- a/lily/staff-symbol-engraver.cc
+++ b/lily/staff-symbol-engraver.cc
@@ -1,12 +1,12 @@
 /*
-  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--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "staff-symbol.hh"
+
 #include "score.hh"
 #include "paper-column.hh"
 #include "paper-def.hh"
@@ -18,62 +18,107 @@
   Manage the staff symbol.
  */
 class Staff_symbol_engraver : public Engraver { 
-  Staff_symbol *span_p_;
 public:
-  VIRTUAL_COPY_CONS(Translator);
-  Staff_symbol_engraver();
+  TRANSLATOR_DECLARATIONS (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();
-	
+  Spanner *span_;
+  
+  virtual ~Staff_symbol_engraver ();
+  virtual void acknowledge_grob (Grob_info);
+  virtual void finalize ();
+  virtual void process_music ();
 };
 
 
-Staff_symbol_engraver::~Staff_symbol_engraver()
+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;
+  span_ = 0;
 }
 
 void
-Staff_symbol_engraver::do_creation_processing()
+Staff_symbol_engraver::process_music ()
 {
-  span_p_ = new Staff_symbol;
-  span_p_->set_bounds(LEFT,get_staff_info().command_pcol_l ());
-  announce_element (Score_element_info (span_p_, 0));
+  if (!span_)
+    {
+      span_ = make_spanner ("StaffSymbol");
+  
+      span_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
+
+      announce_grob (span_, SCM_EOL);
+    }
 }
 
 void
-Staff_symbol_engraver::do_removal_processing()
+Staff_symbol_engraver::finalize ()
 {
-  SCM n = get_property ("numberOfStaffLines",0);
-  SCM ss = get_property ("staffSpace", 0);
+  if (span_)
+    {
+      span_->set_bound (RIGHT,unsmob_grob (get_property ("currentCommandColumn")));
+      typeset_grob (span_);
+    }
+  span_ =0;
+}
 
-  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::acknowledge_grob (Grob_info s)
+{
+  s.grob_->set_property ("staff-symbol", span_->self_scm ());
 
-  span_p_->set_bounds(RIGHT,get_staff_info().command_pcol_l ());
-  typeset_element (span_p_);
-  span_p_ =0;
+  // remove this. probly not necessary?
+  s.grob_->add_dependency (span_); // UGH. UGH. UGH
 }
 
+
+
+
+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
+{
+public:
+  TRANSLATOR_DECLARATIONS (Tab_staff_symbol_engraver);
+protected:
+  virtual void process_music ();
+};
+
 void
-Staff_symbol_engraver::acknowledge_element (Score_element_info s)
+Tab_staff_symbol_engraver::process_music ()
 {
-  s.elem_l_->set_elt_property ("staff-symbol", span_p_->self_scm_);
-  s.elem_l_->add_dependency (span_p_); // UGH. UGH. UGH 
+  bool init = !span_;
+  Staff_symbol_engraver::process_music ();
+  if (init)
+    {
+      int k = scm_ilength (get_property ("stringTunings"));
+      if (k>=0)
+	span_->set_property ("line-count", scm_int2num (k));
+    }
 }
 
+Tab_staff_symbol_engraver::Tab_staff_symbol_engraver ()
+{
+}
 
-ADD_THIS_TRANSLATOR(Staff_symbol_engraver);
-
+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 */       "");