X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbar-number-engraver.cc;h=61242297cde75b2d082373060a27a16a21150d4c;hb=38d7d319eabc906e82fb42002678c6d42a23b6f7;hp=9b8d0bdf86ae5071090912f941a304a10df1800f;hpb=6eced6a93bbfda6e6af37a7d77a8e75a5052dbee;p=lilypond.git

diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc
index 9b8d0bdf86..61242297cd 100644
--- 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--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "paper-column.hh"
@@ -11,21 +11,24 @@
 #include "side-position-interface.hh"
 #include "engraver.hh"
 #include "context.hh"
+#include "grob-array.hh"
+
+#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_;
 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);
 };
@@ -33,8 +36,6 @@ protected:
 void
 Bar_number_engraver::process_music ()
 {
-  // todo include (&&!time->cadenza_b_)
-
   SCM wb = get_property ("whichBar");
 
   if (scm_is_string (wb))
@@ -50,7 +51,7 @@ Bar_number_engraver::process_music ()
 	      create_items ();
 	      // guh.
 	      text_->set_property
-		("text", scm_makfrom0str (to_string (scm_to_int (bn)).to_str0 ()));
+		("text", scm_number_to_string (bn, scm_from_int (10)));
 	    }
 	}
     }
@@ -61,13 +62,19 @@ Bar_number_engraver::Bar_number_engraver ()
   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 ();
   if (text_
+      && !text_->get_parent (X_AXIS)
       && dynamic_cast<Item *> (s)
-      && s->get_property ("break-align-symbol") == ly_symbol2scm ("left-edge"))
+      && (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
@@ -76,13 +83,25 @@ Bar_number_engraver::acknowledge_grob (Grob_info inf)
     }
 }
 
+
+void
+Bar_number_engraver::acknowledge_break_alignment (Grob_info inf)
+{
+  Grob *s = inf.grob ();
+  if (text_
+      && dynamic_cast<Item *> (s))
+    {
+      text_->set_parent (s, X_AXIS);
+    }
+}
+
 void
 Bar_number_engraver::stop_translation_timestep ()
 {
   if (text_)
     {
-      text_->set_property ("side-support-elements", get_property ("stavesFound"));
-
+      text_->set_object ("side-support-elements",
+			 grob_list_to_grob_array (get_property ("stavesFound")));
       text_ = 0;
     }
 }
@@ -94,17 +113,30 @@ Bar_number_engraver::create_items ()
     return;
 
   text_ = make_item ("BarNumber", SCM_EOL);
-  Side_position_interface::set_axis (text_, Y_AXIS);
 }
 
+
+ADD_ACKNOWLEDGER (Bar_number_engraver, break_aligned);
+ADD_ACKNOWLEDGER (Bar_number_engraver, break_alignment);
+
 ADD_TRANSLATOR (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",
-		/* accepts */ "",
-		/* acks  */ "break-aligned-interface",
-		/* reads */ "currentBarNumber stavesFound barNumberVisibility",
-		/* write */ "");
+		/* 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 */
+		""
+		);