Run `make grand-replace'.

[lilypond.git] / lily / bar-number-engraver.cc

diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc
index e9891d216a9d5172c46f0dcb3c9ec2bb0c98cc22..f5744ff76c6736b1e1bca366915d3caa34f345b9 100644 (file)
--- 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--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "paper-column.hh"
@@ -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))
@@ -75,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
@@ -118,21 +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",
+               /* 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 */
+               ""
+               );