Grand fixcc.py run on all .hh .cc files.

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

diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc
index 8a57a721357c26f210921bae8dfb2b741100f0e7..269ed126207960893f042c5b0038175eaf1173b0 100644 (file)
--- 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--2006 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"
@@ -20,14 +31,13 @@
   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:
   Item *text_;
 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,26 +46,24 @@ protected:
 void
 Bar_number_engraver::process_music ()
 {
-  // todo include (&&!time->cadenza_b_)
-
   SCM wb = get_property ("whichBar");
 
   if (scm_is_string (wb))
     {
       Moment mp (robust_scm2moment (get_property ("measurePosition"), Moment (0)));
       if (mp.main_part_ == Rational (0))
-       {
-         SCM bn = get_property ("currentBarNumber");
-         SCM proc = get_property ("barNumberVisibility");
-         if (scm_is_number (bn) && ly_is_procedure (proc)
-             && to_boolean (scm_call_1 (proc, bn)))
-           {
-             create_items ();
-             // guh.
-             text_->set_property
-               ("text", scm_number_to_string (bn, scm_from_int (10)));
-           }
-       }
+        {
+          SCM bn = get_property ("currentBarNumber");
+          SCM proc = get_property ("barNumberVisibility");
+          if (scm_is_number (bn) && ly_is_procedure (proc)
+              && to_boolean (scm_call_1 (proc, bn)))
+            {
+              create_items ();
+              // guh.
+              text_->set_property
+              ("text", scm_number_to_string (bn, scm_from_int (10)));
+            }
+        }
     }
 }
 
@@ -65,16 +73,12 @@ Bar_number_engraver::Bar_number_engraver ()
 }
 
 void
-Bar_number_engraver::acknowledge_break_aligned (Grob_info inf)
+Bar_number_engraver::acknowledge_break_alignment (Grob_info inf)
 {
   Grob *s = inf.grob ();
   if (text_
-      && dynamic_cast<Item *> (s)
-      && s->get_property ("break-align-symbol") == get_property ("barNumberAlignSymbol"))
+      && dynamic_cast<Item *> (s))
     {
-      /*
-       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);
     }
 }
@@ -85,7 +89,7 @@ Bar_number_engraver::stop_translation_timestep ()
   if (text_)
     {
       text_->set_object ("side-support-elements",
-                        grob_list_to_grob_array (get_property ("stavesFound")));
+                         grob_list_to_grob_array (get_property ("stavesFound")));
       text_ = 0;
     }
 }
@@ -99,23 +103,26 @@ Bar_number_engraver::create_items ()
   text_ = make_item ("BarNumber", SCM_EOL);
 }
 
-
-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 */ "",
-               /* read */
-               "barNumberAlignSymbol "
-               "currentBarNumber "
-               "whichBar "
-               "stavesFound "
-               "barNumberVisibility ",
-               /* write */ "");
+                /* 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 */
+                ""
+               );