* scm/output-ps.scm (new-text): don't access t glyph for getting

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

diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc
index e0a6917648ce27e6d6bc55de887b7c12d551dd04..73bebb742c94afe3ae5f1b9cf1d1849bd36be3a0 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 "output-def.hh"
 #include "side-position-interface.hh"
-#include "item.hh"
-#include "moment.hh"
 #include "engraver.hh"
 #include "context.hh"
 
@@ -47,9 +43,7 @@ Bar_number_engraver::process_music ()
   
   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");
@@ -71,7 +65,7 @@ Bar_number_engraver::process_music ()
 
 Bar_number_engraver::Bar_number_engraver ()
 {
-  text_ =0;
+  text_ = 0;
 }
 
                                               
@@ -97,7 +91,7 @@ Bar_number_engraver::stop_translation_timestep ()
     {
       text_->set_property ("side-support-elements", get_property ("stavesFound"));
       
-      text_ =0;
+      text_ = 0;
     }
 }
 
@@ -112,7 +106,7 @@ Bar_number_engraver::create_items ()
   Side_position_interface::set_axis (text_,Y_AXIS);
 }
 
-ENTER_DESCRIPTION (Bar_number_engraver,
+ADD_TRANSLATOR (Bar_number_engraver,
 /* descr */       "A bar number is created whenever measurePosition is zero. It is\n"
                   "put on top of all staves, and appears only at  left side of the staff. "
                   "The staves are taken from @code{stavesFound}, which is maintained by "