release: 1.5.29

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

diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc
index 48268f7a0d37b30d73398b7f78d54302d18da6f4..3ab788c9284b9ae22dded822b4f42730fc171472 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>
 */
 
 
@@ -11,7 +11,6 @@
 #include "paper-column.hh"
 #include "paper-def.hh"
 #include "side-position-interface.hh"
-#include "staff-symbol.hh"
 #include "item.hh"
 #include "moment.hh"
 #include "engraver.hh"
@@ -26,13 +25,9 @@ protected:
 protected:
   virtual void stop_translation_timestep ();
   virtual void acknowledge_grob (Grob_info);
-  virtual void initialize ();
   virtual void create_grobs ();
   void create_items ();
-
-public:
-  VIRTUAL_COPY_CONS (Translator);
-  Bar_number_engraver ();
+  TRANSLATOR_DECLARATIONS(  Bar_number_engraver );
 };
 
 
@@ -49,7 +44,7 @@ Bar_number_engraver::create_grobs ()
   Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0);
   
   if (gh_number_p (bn) &&
-      !mp && now_mom () > Moment (0))
+      !mp.to_bool () && now_mom () > Moment (0))
     {
       create_items ();
 
@@ -59,38 +54,21 @@ Bar_number_engraver::create_grobs ()
     }
 }
 
-ADD_THIS_TRANSLATOR (Bar_number_engraver);
+
 
 Bar_number_engraver::Bar_number_engraver ()
 {
   text_p_ =0;
 }
 
-void
-Bar_number_engraver::initialize ()
-{
-  /*
-    ugh: need to share code with mark_engraver
-   */
-  daddy_trans_l_->set_property ("stavesFound", SCM_EOL); 
-}
-
-
                                               
 void
 Bar_number_engraver::acknowledge_grob (Grob_info inf)
 {
-  Grob * s = inf.elem_l_;
-  if (Staff_symbol::has_interface (s))
-    {
-      SCM sts = get_property ("stavesFound");
-      SCM thisstaff = inf.elem_l_->self_scm ();
-      if (scm_memq (thisstaff, sts) == SCM_BOOL_F)
-       daddy_trans_l_->set_property ("stavesFound", gh_cons (thisstaff, sts));
-    }
-  else if (text_p_
-          && dynamic_cast<Item*> (s)
-          && s->get_grob_property ("break-align-symbol") == ly_symbol2scm ("Left_edge_item"))
+  Grob * s = inf.grob_l_;
+  if (text_p_
+      && dynamic_cast<Item*> (s)
+      && s->get_grob_property ("break-align-symbol") == ly_symbol2scm ("Left_edge_item"))
     {
       /*
        By default this would land on the Paper_column -- so why
@@ -124,3 +102,10 @@ Bar_number_engraver::create_items ()
   announce_grob (text_p_, 0);
 }
 
+ENTER_DESCRIPTION(Bar_number_engraver,
+/* descr */       "A bar number is created whenever measurePosition is zero. It is
+put on top of all staves, and appears only at  left side of the staff.",
+/* creats*/       "BarNumber",
+/* acks  */       "break-aligned-interface",
+/* reads */       "currentBarNumber stavesFound" ,
+/* write */       "");