* SConstruct: Further development.

[lilypond.git] / lily / staff-symbol-engraver.cc

diff --git a/lily/staff-symbol-engraver.cc b/lily/staff-symbol-engraver.cc
index e666f3b87ffbbf1ba22b93a17e23308afdb58648..38c39dffc4e5fb5c7048a2dcf160811d0e749596 100644 (file)
--- 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--2003 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,15 +18,16 @@
   Manage the staff symbol.
  */
 class Staff_symbol_engraver : public Engraver { 
-  Spanner *span_;
 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 ();
 };
 
 
@@ -41,40 +42,79 @@ Staff_symbol_engraver::Staff_symbol_engraver ()
 }
 
 void
-Staff_symbol_engraver::initialize ()
+Staff_symbol_engraver::process_music ()
 {
-  span_ = new Spanner (get_property ("StaffSymbol"));
+  if (!span_)
+    {
+      span_ = make_spanner ("StaffSymbol", SCM_EOL);
   
-  span_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
+      span_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
 
-  announce_grob(span_, SCM_EOL);
+      
+    }
 }
 
 void
 Staff_symbol_engraver::finalize ()
 {
-  span_->set_bound (RIGHT,unsmob_grob (get_property ("currentCommandColumn")));
-  typeset_grob (span_);
+  if (span_)
+    {
+      span_->set_bound (RIGHT,unsmob_grob (get_property ("currentCommandColumn")));
+    }
   span_ =0;
 }
 
 void
 Staff_symbol_engraver::acknowledge_grob (Grob_info s)
 {
-  s.grob_->set_grob_property ("staff-symbol", span_->self_scm ());
-
-  // remove this. probly not necessary?
-  s.grob_->add_dependency (span_); // UGH. UGH. UGH
+  s.grob_->set_property ("staff-symbol", span_->self_scm ());
 }
 
 
 
 
-ENTER_DESCRIPTION(Staff_symbol_engraver,
-/* descr */       "create the constellation of five (default)
-staff lines.",
+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
+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 (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 */       "");