(scm_from_double): more compat glue.

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

diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc
index 1b621c5382c60850552a8356756057dbc34e9a83..cadf996c9a7248bc4b1ba9547d1d9e6c5fe80d31 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 (ly_c_string_p (wb))
+  if (scm_is_string (wb))
     {
       SCM smp = get_property ("measurePosition");
       
@@ -60,7 +60,7 @@ Bar_number_engraver::process_music ()
              create_items ();
              // guh.
              text_->set_property
-               ("text", scm_makfrom0str (to_string (ly_scm2int (bn)).to_str0 ()));
+               ("text", scm_makfrom0str (to_string (scm_to_int (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;
     }
 }