X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmark-engraver.cc;h=67ad8848248c6ac091ac73f23ba80efbedd1d973;hb=cf3642858a2340bb39ee56739f34c799946d4454;hp=1b7ed78c42f7354fbb818df46f43e578ec2cc15e;hpb=fcc5f76615e024803904a055902fdc6a3b24dccb;p=lilypond.git

diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index 1b7ed78c42..67ad884824 100644
--- a/lily/mark-engraver.cc
+++ b/lily/mark-engraver.cc
@@ -1,9 +1,20 @@
 /*
-  mark-engraver.cc -- implement Mark_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1998--2011 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 1998--2007 Jan Nieuwenhuizen <janneke@gnu.org>
+  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 <cctype>
@@ -32,6 +43,7 @@ class Mark_engraver : public Engraver
 
   void create_items (Stream_event *);
   Item *text_;
+  Item *final_text_;
   Stream_event *mark_ev_;
 
 public:
@@ -39,7 +51,9 @@ public:
 
 protected:
   void process_music ();
+  void start_translation_timestep ();
   void stop_translation_timestep ();
+  virtual void finalize ();
 
   DECLARE_TRANSLATOR_LISTENER (mark);
   DECLARE_ACKNOWLEDGER (break_alignment);
@@ -48,6 +62,7 @@ protected:
 Mark_engraver::Mark_engraver ()
 {
   text_ = 0;
+  final_text_ = 0;
   mark_ev_ = 0;
 }
 
@@ -57,11 +72,14 @@ Mark_engraver::acknowledge_break_alignment (Grob_info inf)
   Grob *s = inf.grob ();
   if (text_
       && dynamic_cast<Item *> (s))
-    {
-      text_->set_parent (s, X_AXIS);
-    }
+    text_->set_parent (s, X_AXIS);
 }
 
+void
+Mark_engraver::start_translation_timestep ()
+{
+  final_text_ = 0;
+}
 
 void
 Mark_engraver::stop_translation_timestep ()
@@ -70,11 +88,21 @@ Mark_engraver::stop_translation_timestep ()
   {
     text_->set_object ("side-support-elements",
 		       grob_list_to_grob_array (get_property ("stavesFound")));
+    final_text_ = text_;
     text_ = 0;
   }
   mark_ev_ = 0;
 }
 
+void
+Mark_engraver::finalize ()
+{
+  if (final_text_)
+    final_text_->set_property ("break-visibility",
+			       scm_c_make_vector (3, SCM_BOOL_T));
+  final_text_ = 0;
+}
+
 void
 Mark_engraver::create_items (Stream_event *ev)
 {
@@ -140,11 +168,11 @@ ADD_ACKNOWLEDGER (Mark_engraver, break_alignment);
 
 ADD_TRANSLATOR (Mark_engraver,
 		/* doc */
-		"Create @code{RehearsalMark} objects.  It puts them on top of "
-		"all staves (which is taken from the property "
-		"@code{stavesFound}).  If moving this engraver to a different "
-		"context, @ref{Staff_collecting_engraver} must move along, "
-		"otherwise all marks end up on the same Y@tie{}location.",
+		"Create @code{RehearsalMark} objects.  It puts them on top of"
+		" all staves (which is taken from the property"
+		" @code{stavesFound}).  If moving this engraver to a different"
+		" context, @ref{Staff_collecting_engraver} must move along,"
+		" otherwise all marks end up on the same Y@tie{}location.",
 		
 		/* create */
 		"RehearsalMark ",