Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond

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

diff --git a/lily/tab-staff-symbol-engraver.cc b/lily/tab-staff-symbol-engraver.cc
index 354883141e839fbb92bd49746612285eeaf9cd98..f103e0f6b40cae754c74f9fc4c4c0acc9344a9aa 100644 (file)
--- a/lily/tab-staff-symbol-engraver.cc
+++ b/lily/tab-staff-symbol-engraver.cc
@@ -3,32 +3,26 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
-
+  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "staff-symbol-engraver.hh"
+#include "engraver.hh"
 #include "spanner.hh"
 
-class Tab_staff_symbol_engraver : public Staff_symbol_engraver
+class Tab_staff_symbol_engraver : public Engraver
 {
 public:
   TRANSLATOR_DECLARATIONS (Tab_staff_symbol_engraver);
 protected:
-  virtual void start_spanner ();
+  DECLARE_ACKNOWLEDGER (staff_symbol);
 };
 
 void
-Tab_staff_symbol_engraver::start_spanner ()
+Tab_staff_symbol_engraver::acknowledge_staff_symbol (Grob_info gi)
 {
-  bool init = !span_;
-  Staff_symbol_engraver::start_spanner ();
-  if (init)
-    {
-      int k = scm_ilength (get_property ("stringTunings"));
-      if (k >= 0)
-       span_->set_property ("line-count", scm_from_int (k));
-    }
+  int k = scm_ilength (get_property ("stringTunings"));
+  if (k >= 0)
+    gi.grob ()->set_property ("line-count", scm_from_int (k));
 }
 
 Tab_staff_symbol_engraver::Tab_staff_symbol_engraver ()
@@ -37,11 +31,12 @@ Tab_staff_symbol_engraver::Tab_staff_symbol_engraver ()
 
 #include "translator.icc"
 
-ADD_ACKNOWLEDGER (Tab_staff_symbol_engraver,grob);
+ADD_ACKNOWLEDGER (Tab_staff_symbol_engraver, staff_symbol);
 ADD_TRANSLATOR (Tab_staff_symbol_engraver,
-               /* doc */ "Create a staff-symbol, but look at stringTunings for the number of lines."
-               "staff lines.",
+               /* doc */
+               "Create a staff-symbol, but look at "
+               "stringTunings for the number of lines. "
+               ,
                /* create */ "StaffSymbol",
-               /* accept */ "staff-span-event",
                /* read */ "stringTunings",
                /* write */ "");