X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-symbol-engraver.cc;h=75a5184d088116e37f1009b50e3726f00933d400;hb=955a0a8fa4aa5a1539a4dd281bffb1eb8e614e90;hp=0f29bdc2e355e6b1f5e22faa90621f7bf35d6815;hpb=07a5ed85c189a97d04c550679826dfc5eca2eb18;p=lilypond.git

diff --git a/lily/staff-symbol-engraver.cc b/lily/staff-symbol-engraver.cc
index 0f29bdc2e3..75a5184d08 100644
--- a/lily/staff-symbol-engraver.cc
+++ b/lily/staff-symbol-engraver.cc
@@ -3,13 +3,13 @@
 
   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 "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"
@@ -18,56 +18,103 @@
   Manage the staff symbol.
  */
 class Staff_symbol_engraver : public Engraver { 
-  Spanner *span_p_;
 public:
-  VIRTUAL_COPY_CONS(Translator);
-  Staff_symbol_engraver();
+  TRANSLATOR_DECLARATIONS (Staff_symbol_engraver);
   
 protected:
-  virtual ~Staff_symbol_engraver();
+  Spanner *span_;
+  
+  virtual ~Staff_symbol_engraver ();
   virtual void acknowledge_grob (Grob_info);
-  virtual void finalize();
-  virtual void initialize();
+  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::initialize()
+Staff_symbol_engraver::process_music ()
 {
-  span_p_ = new Spanner (get_property ("StaffSymbol"));
+  if (!span_)
+    {
+      span_ = make_spanner ("StaffSymbol", SCM_EOL);
   
-  span_p_->set_bound(LEFT, unsmob_grob (get_property ("currentCommandColumn")));
+      span_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
 
-  announce_grob (span_p_, 0);
+      
+    }
 }
 
 void
-Staff_symbol_engraver::finalize()
+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.elem_l_->set_grob_property ("staff-symbol", span_p_->self_scm ());
-
-  // remove this. probly not necessary?
-  s.elem_l_->add_dependency (span_p_); // UGH. UGH. UGH
+  s.grob_->set_property ("staff-symbol", span_->self_scm ());
 }
 
 
-ADD_THIS_TRANSLATOR(Staff_symbol_engraver);
 
+
+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 ()
+{
+}
+
+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 */       "");