X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbar-number-engraver.cc;h=4ef961ad7495cba91131a96cd20bb1264edec229;hb=8d0267eb80a7cb026751db0a9eabeb61d958776e;hp=eb91eeef961f68cb4938779d7a0cacaad4f0429b;hpb=5d5fbb2641fda6605cde61ebcd99b9bef2e94b4a;p=lilypond.git

diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc
index eb91eeef96..4ef961ad74 100644
--- a/lily/bar-number-engraver.cc
+++ b/lily/bar-number-engraver.cc
@@ -1,9 +1,9 @@
 /*
-  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--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -11,102 +11,92 @@
 #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"
 #include "translator-group.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 initialize ();
-  virtual void create_grobs ();
-  void create_items();
-
-public:
-  VIRTUAL_COPY_CONS(Translator);
-  Bar_number_engraver();
+  virtual void process_music ();
+  void create_items ();
+  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);
+  // todo include (&&!time->cadenza_b_)
+
+  SCM wb = get_property ("whichBar");
   
-  if (gh_number_p (bn) &&
-      !mp && 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 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 (gh_number_p (bn) && to_boolean(gh_call1(proc, bn)))
+	    {
+	      create_items ();
+	      // guh.
+	      text_->set_grob_property
+		("text", scm_makfrom0str (to_string (gh_scm2int (bn)).to_str0 ()));
+	    }
+	}
     }
+
 }
 
-ADD_THIS_TRANSLATOR(Bar_number_engraver);
 
-Bar_number_engraver::Bar_number_engraver ()
-{
-  text_p_ =0;
-}
 
-void
-Bar_number_engraver::initialize ()
+Bar_number_engraver::Bar_number_engraver ()
 {
-  /*
-    ugh: need to share code with mark_engraver
-   */
-  daddy_trans_l_->set_property ("staffsFound", SCM_EOL); 
+  text_ =0;
 }
 
-
 					       
 void
 Bar_number_engraver::acknowledge_grob (Grob_info inf)
 {
-  Grob * s = inf.elem_l_;
-  if (Staff_symbol::has_interface (s))
-    {
-      SCM sts = get_property ("staffsFound");
-      SCM thisstaff = inf.elem_l_->self_scm ();
-      if (scm_memq (thisstaff, sts) == SCM_BOOL_F)
-	daddy_trans_l_->set_property ("staffsFound", 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_;
+  if (text_
+      && dynamic_cast<Item*> (s)
+      && s->get_grob_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 ("staffsFound"));
-      typeset_grob (text_p_);
-      text_p_ =0;
+      text_->set_grob_property ("side-support-elements", get_property ("stavesFound"));
+      typeset_grob (text_);
+      text_ =0;
     }
 }
 
@@ -114,13 +104,21 @@ 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);
+  text_ = new Item (b);
+  Side_position_interface::set_axis (text_,Y_AXIS);
 
-  announce_grob (text_p_, 0);
+  announce_grob(text_, SCM_EOL);
 }
 
+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.",
+/* creats*/       "BarNumber",
+/* accepts */     "",
+/* acks  */      "break-aligned-interface",
+/* reads */       "currentBarNumber stavesFound barNumberVisibility" ,
+/* write */       "");