X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbar-number-engraver.cc;h=3693f97b3e286095f23a10cb94a38334d486432c;hb=98311cc29e8664d281bcc40a808684e7553c8eaa;hp=8a57a721357c26f210921bae8dfb2b741100f0e7;hpb=15f28c1911d3151ce5c0ce1b33f26f284296fe71;p=lilypond.git

diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc
index 8a57a72135..3693f97b3e 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--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "paper-column.hh"
@@ -20,7 +20,6 @@
   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:
@@ -28,6 +27,7 @@ protected:
 protected:
   void stop_translation_timestep ();
   DECLARE_ACKNOWLEDGER (break_aligned);
+  DECLARE_ACKNOWLEDGER (break_alignment);
   void process_music ();
   void create_items ();
   TRANSLATOR_DECLARATIONS (Bar_number_engraver);
@@ -36,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))
@@ -64,13 +62,19 @@ Bar_number_engraver::Bar_number_engraver ()
   text_ = 0;
 }
 
+
+/*
+  see rehearsal mark comments.
+ */
 void
 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") == get_property ("barNumberAlignSymbol"))
+      && (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
@@ -79,6 +83,18 @@ Bar_number_engraver::acknowledge_break_aligned (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 ()
 {
@@ -100,7 +116,8 @@ Bar_number_engraver::create_items ()
 }
 
 
-ADD_ACKNOWLEDGER(Bar_number_engraver,break_aligned);
+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 measurePosition "
@@ -111,9 +128,7 @@ ADD_TRANSLATOR (Bar_number_engraver,
 		"@code{@ref{Staff_collecting_engraver}}. ",
 
 		/* create */ "BarNumber",
-		/* accept */ "",
 		/* read */
-		"barNumberAlignSymbol "
 		"currentBarNumber "
 		"whichBar "
 		"stavesFound "