* 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 17e96949b4b3fdf4f2b14668fca6d3988d1e78cd..38c39dffc4e5fb5c7048a2dcf160811d0e749596 100644 (file)
--- a/lily/staff-symbol-engraver.cc
+++ b/lily/staff-symbol-engraver.cc
@@ -9,7 +9,7 @@
 
 #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"
@@ -19,7 +19,7 @@
  */
 class Staff_symbol_engraver : public Engraver { 
 public:
-  TRANSLATOR_DECLARATIONS(Staff_symbol_engraver);
+  TRANSLATOR_DECLARATIONS (Staff_symbol_engraver);
   
 protected:
   Spanner *span_;
@@ -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);
+      
     }
 }
 
@@ -60,7 +60,6 @@ Staff_symbol_engraver::finalize ()
   if (span_)
     {
       span_->set_bound (RIGHT,unsmob_grob (get_property ("currentCommandColumn")));
-      typeset_grob (span_);
     }
   span_ =0;
 }
@@ -69,15 +68,12 @@ 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,
+ENTER_DESCRIPTION (Staff_symbol_engraver,
 /* descr */       "Create the constellation of five (default) "
 "staff lines.",
 /* creats*/       "StaffSymbol",
@@ -92,7 +88,7 @@ ENTER_DESCRIPTION(Staff_symbol_engraver,
 class Tab_staff_symbol_engraver : public Staff_symbol_engraver
 {
 public:
-  TRANSLATOR_DECLARATIONS(Tab_staff_symbol_engraver);
+  TRANSLATOR_DECLARATIONS (Tab_staff_symbol_engraver);
 protected:
   virtual void process_music ();
 };
@@ -101,20 +97,20 @@ void
 Tab_staff_symbol_engraver::process_music ()
 {
   bool init = !span_;
-  Staff_symbol_engraver::process_music();
+  Staff_symbol_engraver::process_music ();
   if (init)
     {
       int k = scm_ilength (get_property ("stringTunings"));
       if (k>=0)
-       span_->set_property ("line-count", gh_int2scm (k));
+       span_->set_property ("line-count", scm_int2num (k));
     }
 }
 
-Tab_staff_symbol_engraver::Tab_staff_symbol_engraver()
+Tab_staff_symbol_engraver::Tab_staff_symbol_engraver ()
 {
 }
 
-ENTER_DESCRIPTION(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",