* configure.in: Test for and accept lmodern if EC fonts not found.

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

diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc
index 75a147f6bd9e7b930a11385aebddb448403e5786..373cdf4c073214c8e586b2fd365b1b648b58cb4f 100644 (file)
--- a/lily/bar-number-engraver.cc
+++ b/lily/bar-number-engraver.cc
@@ -6,13 +6,9 @@
   (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-
-#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"
 #include "engraver.hh"
 #include "context.hh"
 
@@ -45,22 +41,20 @@ Bar_number_engraver::process_music ()
 
   SCM wb = get_property ("whichBar");
   
-  if (ly_string_p (wb))
+  if (scm_is_string (wb))
     {
-      SCM smp = get_property ("measurePosition");
-      
-      Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0);
+      Moment mp (robust_scm2moment (get_property ("measurePosition"),Moment (0)));
       if (mp.main_part_ == Rational (0))
        {
          SCM bn = get_property ("currentBarNumber");
          SCM proc = get_property ("barNumberVisibility");
-         if (ly_number_p (bn) && ly_procedure_p (proc)
+         if (scm_is_number (bn) && ly_c_procedure_p (proc)
              && to_boolean (scm_call_1(proc, bn)))
            {
              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 +90,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 +102,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,