X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbar-number-engraver.cc;h=7ba942a3b37640e86c9250e7052a7b3015ee9806;hb=286b81accdca4a86239425de564014a145109a6e;hp=3ab788c9284b9ae22dded822b4f42730fc171472;hpb=d9b43b93f2c885409bafdb157138158f65cc49aa;p=lilypond.git

diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc
index 3ab788c928..7ba942a3b3 100644
--- a/lily/bar-number-engraver.cc
+++ b/lily/bar-number-engraver.cc
@@ -1,90 +1,103 @@
 /*
-  bar-number-grav.cc -- implement Bar_number_engraver
+  bar-number-engraver.cc -- implement Bar_number_engraver
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (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 "translator-group.hh"
+#include "context.hh"
+
+/*
+  
+TODO: detect the top staff (stavesFound), and acknowledge staff-group
+system-start-delims. If we find these, and the top staff is in the
+staff-group, add padding to the bar number.
+
+*/
 
 
 class Bar_number_engraver : public Engraver
 {
 protected:
-  Item* text_p_;
-
+  Item* text_;
 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 );
+  TRANSLATOR_DECLARATIONS (Bar_number_engraver );
 };
 
 
-/*
-  TODO: more advanced formatting via SCM function, perhaps barnumbers
-  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 (ly_c_string_p (wb))
     {
-      create_items ();
-
-      // guh.
-      text_p_->set_grob_property ("text",
-				 ly_str02scm (to_str (gh_scm2int (bn)).ch_C ()));
+      SCM smp = get_property ("measurePosition");
+      
+      Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0);
+      if (mp.main_part_ == Rational (0))
+	{
+	  SCM bn = get_property ("currentBarNumber");
+	  SCM proc = get_property ("barNumberVisibility");
+	  if (ly_c_number_p (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 ()));
+	    }
+	}
     }
+
 }
 
 
 
 Bar_number_engraver::Bar_number_engraver ()
 {
-  text_p_ =0;
+  text_ =0;
 }
 
 					       
 void
 Bar_number_engraver::acknowledge_grob (Grob_info inf)
 {
-  Grob * s = inf.grob_l_;
-  if (text_p_
+  Grob * s = inf.grob_;
+  if (text_
       && dynamic_cast<Item*> (s)
-      && s->get_grob_property ("break-align-symbol") == ly_symbol2scm ("Left_edge_item"))
+      && s->get_property ("break-align-symbol") == ly_symbol2scm ("left-edge"))
     {
       /*
 	By default this would land on the Paper_column -- so why
 	doesn't it work when you leave this out?  */
-      text_p_->set_parent (s, X_AXIS);
+      text_->set_parent (s, X_AXIS);
     }
 }
 
 void 
 Bar_number_engraver::stop_translation_timestep ()
 {
-  if (text_p_)
+  if (text_)
     {
-      text_p_->set_grob_property ("side-support-elements", get_property ("stavesFound"));
-      typeset_grob (text_p_);
-      text_p_ =0;
+      text_->set_property ("side-support-elements", get_property ("stavesFound"));
+      
+      text_ =0;
     }
 }
 
@@ -92,20 +105,22 @@ Bar_number_engraver::stop_translation_timestep ()
 void
 Bar_number_engraver::create_items ()
 {
-  if (text_p_)
+  if (text_)
     return;
 
-  SCM b = get_property ("BarNumber");
-  text_p_ = new Item (b);
-  Side_position_interface::set_axis (text_p_,Y_AXIS);
-
-  announce_grob (text_p_, 0);
+  text_ = make_item ("BarNumber", SCM_EOL);
+  Side_position_interface::set_axis (text_,Y_AXIS);
 }
 
-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.",
+ENTER_DESCRIPTION (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 "
+		   "@code{@ref{Staff_collecting_engraver}}. "
+		   ,
+		   
 /* creats*/       "BarNumber",
-/* acks  */       "break-aligned-interface",
-/* reads */       "currentBarNumber stavesFound" ,
+/* accepts */     "",
+/* acks  */      "break-aligned-interface",
+/* reads */       "currentBarNumber stavesFound barNumberVisibility" ,
 /* write */       "");