X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmark-engraver.cc;h=8c0233c9095b6b93cdd3ca4186daad873682f024;hb=54d7ede54447e7837b5b697bd919f895649c5e50;hp=b236779ac17773029e51e5eb053ed2a4297fb421;hpb=c4c0ba811cd526f047de3f4d3c77abcc32a3e076;p=lilypond.git

diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index b236779ac1..8c0233c909 100644
--- a/lily/mark-engraver.cc
+++ b/lily/mark-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2007 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include <cctype>
@@ -43,7 +43,6 @@ protected:
 
   DECLARE_TRANSLATOR_LISTENER (mark);
   DECLARE_ACKNOWLEDGER (break_alignment);
-  DECLARE_ACKNOWLEDGER (break_aligned);
 };
 
 Mark_engraver::Mark_engraver ()
@@ -52,30 +51,6 @@ Mark_engraver::Mark_engraver ()
   mark_ev_ = 0;
 }
 
-/*
-  This is a flawed approach, since various break-aligned objects may
-  not appear depending on key signature etc.
-
-   We keep it in case someone puts the engraver in a lower context than score.
- */
-void
-Mark_engraver::acknowledge_break_aligned (Grob_info inf)
-{
-  Grob *s = inf.grob ();
-  if (text_
-      && !text_->get_parent (X_AXIS)
-      && (text_->get_property_data (ly_symbol2scm ("break-align-symbol"))
-	  == s->get_property_data (ly_symbol2scm ("break-align-symbol")))
-      && Axis_group_interface::has_interface (s))
-    {
-      /*
-	RehearsalMark cannot be break-aligned, since the width of the
-	object should not be taken into alignment considerations.
-      */
-      text_->set_parent (s, X_AXIS);
-    }
-}
-
 void
 Mark_engraver::acknowledge_break_alignment (Grob_info inf)
 {
@@ -92,11 +67,11 @@ void
 Mark_engraver::stop_translation_timestep ()
 {
   if (text_)
-    {
-      text_->set_object ("side-support-elements",
-			 grob_list_to_grob_array (get_property ("stavesFound")));
-      text_ = 0;
-    }
+  {
+    text_->set_object ("side-support-elements",
+		       grob_list_to_grob_array (get_property ("stavesFound")));
+    text_ = 0;
+  }
   mark_ev_ = 0;
 }
 
@@ -113,7 +88,7 @@ IMPLEMENT_TRANSLATOR_LISTENER (Mark_engraver, mark);
 void
 Mark_engraver::listen_mark (Stream_event *ev)
 {
-  mark_ev_ = ev;
+  ASSIGN_EVENT_ONCE (mark_ev_, ev);
 }
 
 /*
@@ -161,7 +136,6 @@ Mark_engraver::process_music ()
     }
 }
 
-ADD_ACKNOWLEDGER (Mark_engraver, break_aligned);
 ADD_ACKNOWLEDGER (Mark_engraver, break_alignment);
 
 ADD_TRANSLATOR (Mark_engraver,
@@ -173,7 +147,6 @@ ADD_TRANSLATOR (Mark_engraver,
 		"end up on the same Y-location",
 		
 		/* create */ "RehearsalMark",
-		/* accept */ "mark-event",
 		/* read */
 		"markFormatter "
 		"rehearsalMark "