Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond

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

diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc
index f4cc5e66eb460896f28c7fb9601ae69ac1708392..9f2396504248255304a885ac9d6773718798dfa6 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--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:
@@ -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
@@ -101,12 +98,7 @@ Bar_number_engraver::acknowledge_break_alignment (Grob_info inf)
 void
 Bar_number_engraver::stop_translation_timestep ()
 {
-  if (text_)
-    {
-      text_->set_object ("side-support-elements",
-                        grob_list_to_grob_array (get_property ("stavesFound")));
-      text_ = 0;
-    }
+  text_ = 0;
 }
 
 void
@@ -131,7 +123,6 @@ ADD_TRANSLATOR (Bar_number_engraver,
                "@code{@ref{Staff_collecting_engraver}}. ",
 
                /* create */ "BarNumber",
-               /* accept */ "",
                /* read */
                "currentBarNumber "
                "whichBar "