X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbar-number-engraver.cc;h=82bc09f0ed02160e009868013bb31fcb9299f517;hb=0052082fd05c21b95cdd5f20c2a11d14e3ce2d1f;hp=7f35901d816bd08fd5146e66e9d11cc81168d3de;hpb=3f8485925e8c879fe4c9ae86acef9804126c3b91;p=lilypond.git

diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc
index 7f35901d81..82bc09f0ed 100644
--- a/lily/bar-number-engraver.cc
+++ b/lily/bar-number-engraver.cc
@@ -1,9 +1,20 @@
 /*
-  bar-number-engraver.cc -- implement Bar_number_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "paper-column.hh"
@@ -26,7 +37,6 @@ protected:
   Item *text_;
 protected:
   void stop_translation_timestep ();
-  DECLARE_ACKNOWLEDGER (break_aligned);
   DECLARE_ACKNOWLEDGER (break_alignment);
   void process_music ();
   void create_items ();
@@ -62,28 +72,6 @@ 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_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_->set_parent (s, X_AXIS);
-    }
-}
-
-
 void
 Bar_number_engraver::acknowledge_break_alignment (Grob_info inf)
 {
@@ -98,7 +86,12 @@ Bar_number_engraver::acknowledge_break_alignment (Grob_info inf)
 void
 Bar_number_engraver::stop_translation_timestep ()
 {
-  text_ = 0;
+  if (text_)
+    {
+      text_->set_object ("side-support-elements",
+			 grob_list_to_grob_array (get_property ("stavesFound")));
+      text_ = 0;
+    }
 }
 
 void
@@ -111,21 +104,26 @@ Bar_number_engraver::create_items ()
 }
 
 
-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 "
-		"is zero and when there is a bar line (ie. when @code{whichBar} is set. "
-		"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}}. ",
-
-		/* create */ "BarNumber",
+		/* 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 */ "");
+
+		/* write */
+		""
+		);