release: 1.5.37

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

diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc
index b6226d176d73aebfa03bdf86e5c41fca947903c2..5d6373392fb014ef4d325d96d4ba63f030b1c8ec 100644 (file)
--- a/lily/bar-number-engraver.cc
+++ b/lily/bar-number-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -21,11 +21,10 @@ class Bar_number_engraver : public Engraver
 {
 protected:
   Item* text_p_;
-
 protected:
   virtual void stop_translation_timestep ();
   virtual void acknowledge_grob (Grob_info);
-  virtual void create_grobs ();
+  virtual void process_music ();
   void create_items ();
   TRANSLATOR_DECLARATIONS(  Bar_number_engraver );
 };
@@ -36,22 +35,30 @@ protected:
   every 5 measures?  */
 
 void
-Bar_number_engraver::create_grobs ()
+Bar_number_engraver::process_music ()
 {
   // todo include (&&!time->cadenza_b_)
-  SCM bn = get_property ("currentBarNumber");
-  SCM smp = get_property ("measurePosition");
-  Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0);
+
+  SCM wb = get_property ("whichBar");
   
-  if (gh_number_p (bn) &&
-      !mp.to_bool () && now_mom () > Moment (0))
+  if (gh_string_p (wb))
     {
-      create_items ();
-
-      // guh.
-      text_p_->set_grob_property ("text",
-                                ly_str02scm (to_str (gh_scm2int (bn)).ch_C ()));
+      SCM bn = get_property ("currentBarNumber");
+      SCM smp = get_property ("measurePosition");
+      int ibn = gh_number_p (bn) ? gh_scm2int(bn) : 1;
+      
+      Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0);
+      if (mp.main_part_ == Rational (0)
+         && ibn != 1)
+       {
+         create_items ();
+         
+         // guh.
+         text_p_->set_grob_property ("text",
+                                     ly_str02scm (to_str (gh_scm2int (bn)).ch_C ()));
+       }
     }
+
 }
 
 
@@ -68,7 +75,7 @@ Bar_number_engraver::acknowledge_grob (Grob_info inf)
   Grob * s = inf.grob_l_;
   if (text_p_
       && dynamic_cast<Item*> (s)
-      && s->get_grob_property ("break-align-symbol") == ly_symbol2scm ("Left_edge_item"))
+      && s->get_grob_property ("break-align-symbol") == ly_symbol2scm ("left-edge"))
     {
       /*
        By default this would land on the Paper_column -- so why
@@ -99,7 +106,7 @@ Bar_number_engraver::create_items ()
   text_p_ = new Item (b);
   Side_position_interface::set_axis (text_p_,Y_AXIS);
 
-  announce_grob (text_p_, 0);
+  announce_grob(text_p_, SCM_EOL);
 }
 
 ENTER_DESCRIPTION(Bar_number_engraver,