X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fbar-number-engraver.cc;h=61242297cde75b2d082373060a27a16a21150d4c;hb=135a909ba15cdb78344d9eef8c16b45f96efa5fc;hp=f4cc5e66eb460896f28c7fb9601ae69ac1708392;hpb=bc1519b07df5412a825989a5fc2d9455f7a9e6c1;p=lilypond.git

diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc
index f4cc5e66eb..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--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 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:
@@ -37,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))
@@ -76,8 +73,8 @@ Bar_number_engraver::acknowledge_break_aligned (Grob_info inf)
   if (text_
       && !text_->get_parent (X_AXIS)
       && dynamic_cast<Item *> (s)
-      && (s->get_property_data (ly_symbol2scm ("break-align-symbol"))
-	  == text_->get_property_data (ly_symbol2scm ("break-align-symbol"))))
+      && (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
@@ -119,22 +116,27 @@ Bar_number_engraver::create_items ()
 }
 
 
-ADD_ACKNOWLEDGER(Bar_number_engraver,break_aligned);
-ADD_ACKNOWLEDGER(Bar_number_engraver,break_alignment);
+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",
-		/* accept */ "",
+		/* 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 */
+		""
+		);