X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbar-number-engraver.cc;h=61242297cde75b2d082373060a27a16a21150d4c;hb=f69bd6761b3b3c077b0b994bd65b5a5bd79b5582;hp=bd04befbbc17a7b655a515ccaa2eb310644d7a65;hpb=7ba6b0e42d76063d7657325cea92d76d7701fb94;p=lilypond.git

diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc
index bd04befbbc..61242297cd 100644
--- a/lily/bar-number-engraver.cc
+++ b/lily/bar-number-engraver.cc
@@ -3,124 +3,140 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.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"
+#include "grob-array.hh"
 
-/*
-  
-TODO: detect the top staff (staffsFound), 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.
+#include "translator.icc"
 
+/*
+  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 process_music ();
+  void stop_translation_timestep ();
+  DECLARE_ACKNOWLEDGER (break_aligned);
+  DECLARE_ACKNOWLEDGER (break_alignment);
+  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::process_music ()
 {
-  // todo include (&&!time->cadenza_b_)
-
   SCM wb = get_property ("whichBar");
-  
-  if (gh_string_p (wb))
+
+  if (scm_is_string (wb))
     {
-      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)
+      Moment mp (robust_scm2moment (get_property ("measurePosition"), Moment (0)));
+      if (mp.main_part_ == Rational (0))
 	{
-	  create_items ();
-	  
-	  // guh.
-	  text_p_->set_grob_property ("text",
-				      ly_str02scm (to_str (gh_scm2int (bn)).ch_C ()));
+	  SCM bn = get_property ("currentBarNumber");
+	  SCM proc = get_property ("barNumberVisibility");
+	  if (scm_is_number (bn) && ly_is_procedure (proc)
+	      && to_boolean (scm_call_1 (proc, bn)))
+	    {
+	      create_items ();
+	      // guh.
+	      text_->set_property
+		("text", scm_number_to_string (bn, scm_from_int (10)));
+	    }
 	}
     }
-
 }
 
-
-
 Bar_number_engraver::Bar_number_engraver ()
 {
-  text_p_ =0;
+  text_ = 0;
 }
 
-					       
+
+/*
+  see rehearsal mark comments.
+ */
 void
-Bar_number_engraver::acknowledge_grob (Grob_info inf)
+Bar_number_engraver::acknowledge_break_aligned (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"))
+  Grob *s = inf.grob ();
+  if (text_
+      && !text_->get_parent (X_AXIS)
+      && dynamic_cast<Item *> (s)
+      && (s->get_property_data ("break-align-symbol")
+	  == text_->get_property_data ("break-align-symbol")))
     {
       /*
 	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 ()
+
+void
+Bar_number_engraver::acknowledge_break_alignment (Grob_info inf)
 {
-  if (text_p_)
+  Grob *s = inf.grob ();
+  if (text_
+      && dynamic_cast<Item *> (s))
     {
-      text_p_->set_grob_property ("side-support-elements", get_property ("stavesFound"));
-      typeset_grob (text_p_);
-      text_p_ =0;
+      text_->set_parent (s, X_AXIS);
     }
 }
 
+void
+Bar_number_engraver::stop_translation_timestep ()
+{
+  if (text_)
+    {
+      text_->set_object ("side-support-elements",
+			 grob_list_to_grob_array (get_property ("stavesFound")));
+      text_ = 0;
+    }
+}
 
 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_, SCM_EOL);
+  text_ = make_item ("BarNumber", SCM_EOL);
 }
 
-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 */       "");
+
+ADD_ACKNOWLEDGER (Bar_number_engraver, break_aligned);
+ADD_ACKNOWLEDGER (Bar_number_engraver, break_alignment);
+
+ADD_TRANSLATOR (Bar_number_engraver,
+		/* doc */
+		"A bar number is created whenever @code{measurePosition} is"
+		" zero and when there is a bar line (i.e., when"
+		" @code{whichBar} is set).  It is put on top of all staves,"
+		" and appears only at the left side of the staff.  The staves"
+		" are taken from @code{stavesFound}, which is maintained by"
+		" @ref{Staff_collecting_engraver}.",
+
+		/* create */
+		"BarNumber ",
+
+		/* read */
+		"currentBarNumber "
+		"whichBar "
+		"stavesFound "
+		"barNumberVisibility ",
+
+		/* write */
+		""
+		);