(struct Simple_spacer): remove

[lilypond.git] / lily / bar-number-engraver.cc

diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc
index cea5a246e8016257ea917a6d293b8e4a41bb3897..7ba942a3b37640e86c9250e7052a7b3015ee9806 100644 (file)
--- a/lily/bar-number-engraver.cc
+++ b/lily/bar-number-engraver.cc
@@ -9,7 +9,7 @@
 
 #include "lily-guile.hh"
 #include "paper-column.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "side-position-interface.hh"
 #include "item.hh"
 #include "moment.hh"
@@ -45,7 +45,7 @@ Bar_number_engraver::process_music ()
 
   SCM wb = get_property ("whichBar");
   
-  if (gh_string_p (wb))
+  if (ly_c_string_p (wb))
     {
       SCM smp = get_property ("measurePosition");
       
@@ -54,13 +54,13 @@ Bar_number_engraver::process_music ()
        {
          SCM bn = get_property ("currentBarNumber");
          SCM proc = get_property ("barNumberVisibility");
-         if (gh_number_p (bn) && gh_procedure_p (proc)
-             && to_boolean (gh_call1(proc, bn)))
+         if (ly_c_number_p (bn) && ly_c_procedure_p (proc)
+             && to_boolean (scm_call_1(proc, bn)))
            {
              create_items ();
              // guh.
              text_->set_property
-               ("text", scm_makfrom0str (to_string (gh_scm2int (bn)).to_str0 ()));
+               ("text", scm_makfrom0str (to_string (ly_scm2int (bn)).to_str0 ()));
            }
        }
     }
@@ -96,7 +96,7 @@ Bar_number_engraver::stop_translation_timestep ()
   if (text_)
     {
       text_->set_property ("side-support-elements", get_property ("stavesFound"));
-      typeset_grob (text_);
+      
       text_ =0;
     }
 }
@@ -108,10 +108,8 @@ Bar_number_engraver::create_items ()
   if (text_)
     return;
 
-  text_ = make_item ("BarNumber");
+  text_ = make_item ("BarNumber", SCM_EOL);
   Side_position_interface::set_axis (text_,Y_AXIS);
-
-  announce_grob (text_, SCM_EOL);
 }
 
 ENTER_DESCRIPTION (Bar_number_engraver,