*** empty log message ***

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

diff --git a/lily/staff-symbol-engraver.cc b/lily/staff-symbol-engraver.cc
index 974c5ae1ebd1af643033a76607080882766dd278..d9d9fb574336323e409fd33995d1224b3ec640e3 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--2004 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"
@@ -46,11 +46,11 @@ Staff_symbol_engraver::process_music ()
 {
   if (!span_)
     {
-      span_ = make_spanner ("StaffSymbol");
+      span_ = make_spanner ("StaffSymbol", SCM_EOL);
   
       span_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
 
-      announce_grob (span_, SCM_EOL);
+      
     }
 }
 
@@ -59,25 +59,21 @@ Staff_symbol_engraver::finalize ()
 {
   if (span_)
     {
-      span_->set_bound (RIGHT,unsmob_grob (get_property ("currentCommandColumn")));
-      typeset_grob (span_);
+      span_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn")));
     }
-  span_ =0;
+  span_ = 0;
 }
 
 void
 Staff_symbol_engraver::acknowledge_grob (Grob_info s)
 {
   s.grob_->set_property ("staff-symbol", span_->self_scm ());
-
-  // remove this. probly not necessary?
-  s.grob_->add_dependency (span_); // UGH. UGH. UGH
 }
 
 
 
 
-ENTER_DESCRIPTION (Staff_symbol_engraver,
+ADD_TRANSLATOR (Staff_symbol_engraver,
 /* descr */       "Create the constellation of five (default) "
 "staff lines.",
 /* creats*/       "StaffSymbol",
@@ -105,7 +101,7 @@ Tab_staff_symbol_engraver::process_music ()
   if (init)
     {
       int k = scm_ilength (get_property ("stringTunings"));
-      if (k>=0)
+      if (k>= 0)
        span_->set_property ("line-count", scm_int2num (k));
     }
 }
@@ -114,7 +110,7 @@ Tab_staff_symbol_engraver::Tab_staff_symbol_engraver ()
 {
 }
 
-ENTER_DESCRIPTION (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",