Fix merging problem

[lilypond.git] / lily / mark-engraver.cc

diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index 70115d62fdcd5de334cb2acda79ceb9a49e41747..1f4a0c3f728dc174e451b5f26390955fbe06cd49 100644 (file)
--- 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>
@@ -64,8 +64,8 @@ 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")))
+      && (text_->get_property_data ("break-align-symbol")
+         == s->get_property_data ("break-align-symbol"))
       && Axis_group_interface::has_interface (s))
     {
       /*
@@ -91,12 +91,7 @@ Mark_engraver::acknowledge_break_alignment (Grob_info inf)
 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_ = 0;
   mark_ev_ = 0;
 }
 
@@ -173,7 +168,6 @@ ADD_TRANSLATOR (Mark_engraver,
                "end up on the same Y-location",
                
                /* create */ "RehearsalMark",
-               /* accept */ "mark-event",
                /* read */
                "markFormatter "
                "rehearsalMark "