Imported Upstream version 2.14.2

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

diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc
index 61242297cde75b2d082373060a27a16a21150d4c..82bc09f0ed02160e009868013bb31fcb9299f517 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--2009 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)
 {
@@ -116,7 +104,6 @@ Bar_number_engraver::create_items ()
 }
 
 
-ADD_ACKNOWLEDGER (Bar_number_engraver, break_aligned);
 ADD_ACKNOWLEDGER (Bar_number_engraver, break_alignment);
 
 ADD_TRANSLATOR (Bar_number_engraver,