X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-symbol-engraver.cc;h=c3bc1c763cb0c246dfe14f3d602ad496ef4a7787;hb=7e79448be56dad04b97e89e0c49dce64bf16100e;hp=dff7448e1230a9d6eedca05636c630574540c9a3;hpb=2804f8f79e01dc606ce067bffda2d966524e6e36;p=lilypond.git

diff --git a/lily/staff-symbol-engraver.cc b/lily/staff-symbol-engraver.cc
index dff7448e12..c3bc1c763c 100644
--- a/lily/staff-symbol-engraver.cc
+++ b/lily/staff-symbol-engraver.cc
@@ -3,77 +3,111 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-
 #include "score.hh"
 #include "paper-column.hh"
-#include "paper-def.hh"
+#include "output-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_;
+   Manage the staff symbol.
+*/
+class Staff_symbol_engraver : public Engraver
+{
 public:
-  TRANSLATOR_DECLARATIONS(Staff_symbol_engraver);
-  
+  TRANSLATOR_DECLARATIONS (Staff_symbol_engraver);
+
 protected:
+  Spanner *span_;
+
   virtual ~Staff_symbol_engraver ();
   virtual void acknowledge_grob (Grob_info);
   virtual void finalize ();
-  virtual void initialize ();
+  virtual void process_music ();
 };
 
-
 Staff_symbol_engraver::~Staff_symbol_engraver ()
 {
-  assert (!span_p_);
+  assert (!span_);
 }
 
 Staff_symbol_engraver::Staff_symbol_engraver ()
 {
-  span_p_ = 0;
+  span_ = 0;
 }
 
 void
-Staff_symbol_engraver::initialize ()
+Staff_symbol_engraver::process_music ()
 {
-  span_p_ = new Spanner (get_property ("StaffSymbol"));
-  
-  span_p_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
+  if (!span_)
+    {
+      span_ = make_spanner ("StaffSymbol", SCM_EOL);
 
-  announce_grob(span_p_, SCM_EOL);
+      span_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
+    }
 }
 
 void
 Staff_symbol_engraver::finalize ()
 {
-  span_p_->set_bound (RIGHT,unsmob_grob (get_property ("currentCommandColumn")));
-  typeset_grob (span_p_);
-  span_p_ =0;
+  if (span_)
+    {
+      span_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn")));
+    }
+  span_ = 0;
 }
 
 void
 Staff_symbol_engraver::acknowledge_grob (Grob_info s)
 {
-  s.grob_l_->set_grob_property ("staff-symbol", span_p_->self_scm ());
-
-  // remove this. probly not necessary?
-  s.grob_l_->add_dependency (span_p_); // UGH. UGH. UGH
+  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 */ "",
+		/* 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
+Tab_staff_symbol_engraver::process_music ()
+{
+  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 ()
+{
+}
 
-ENTER_DESCRIPTION(Staff_symbol_engraver,
-/* descr */       "create the constellation of five (default)
-staff lines.",
-/* creats*/       "StaffSymbol",
-/* acks  */       "grob-interface",
-/* reads */       "",
-/* write */       "");
+ADD_TRANSLATOR (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 */ "");