X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbar-number-engraver.cc;h=82bc09f0ed02160e009868013bb31fcb9299f517;hb=e94c4a66c9d565749d8a121fc0267ddeb423ca13;hp=a5d5023b9bea55d0dfde5ec51deb0a6d1f2add24;hpb=a6bd229f7fe1dc4a03478e14ccc0c0c66b225061;p=lilypond.git diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc index a5d5023b9b..82bc09f0ed 100644 --- a/lily/bar-number-engraver.cc +++ b/lily/bar-number-engraver.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2010 Han-Wen Nienhuys + Copyright (C) 1997--2011 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -37,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 (); @@ -73,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 (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) { @@ -127,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,