X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fmark-engraver.cc;h=657efb9f225c1ad62d7a910dd240b88b9458fe7d;hb=66bd391a59ab23b366bd0d534123768fc92006f4;hp=2a4fbe351048efaedc63ef1ef0783c0ea40eadab;hpb=b37e3f652677ae0298423db9fa0e552e5fce0c92;p=lilypond.git

diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index 2a4fbe3510..657efb9f22 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--2010 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 1998--2006 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>
@@ -17,9 +28,12 @@ using namespace std;
 #include "grob-array.hh"
 #include "international.hh"
 #include "item.hh"
+#include "stream-event.hh"
 #include "text-interface.hh"
 #include "warn.hh"
 
+#include "translator.icc"
+
 /**
    put stuff over or next to  bars.  Examples: bar numbers, marginal notes,
    rehearsal marks.
@@ -27,58 +41,70 @@ using namespace std;
 class Mark_engraver : public Engraver
 {
 
-  void create_items (Music *);
+  void create_items (Stream_event *);
   Item *text_;
-  Music *mark_ev_;
+  Item *final_text_;
+  Stream_event *mark_ev_;
 
 public:
   TRANSLATOR_DECLARATIONS (Mark_engraver);
 
 protected:
-  virtual bool try_music (Music *ev);
   void process_music ();
+  void start_translation_timestep ();
   void stop_translation_timestep ();
+  virtual void finalize ();
 
-  DECLARE_ACKNOWLEDGER (break_aligned);
+  DECLARE_TRANSLATOR_LISTENER (mark);
+  DECLARE_ACKNOWLEDGER (break_alignment);
 };
 
 Mark_engraver::Mark_engraver ()
 {
   text_ = 0;
+  final_text_ = 0;
   mark_ev_ = 0;
 }
 
 void
-Mark_engraver::acknowledge_break_aligned (Grob_info inf)
+Mark_engraver::acknowledge_break_alignment (Grob_info inf)
 {
   Grob *s = inf.grob ();
   if (text_
-      && (get_property ("rehearsalMarkAlignSymbol")
-	  == s->get_property ("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);
-    }
+      && dynamic_cast<Item *> (s))
+    text_->set_parent (s, X_AXIS);
+}
+
+void
+Mark_engraver::start_translation_timestep ()
+{
+  final_text_ = 0;
 }
 
 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")));
+    final_text_ = text_;
+    text_ = 0;
+  }
   mark_ev_ = 0;
 }
 
 void
-Mark_engraver::create_items (Music *ev)
+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)
 {
   if (text_)
     return;
@@ -86,11 +112,11 @@ Mark_engraver::create_items (Music *ev)
   text_ = make_item ("RehearsalMark", ev->self_scm ());
 }
 
-bool
-Mark_engraver::try_music (Music *r)
+IMPLEMENT_TRANSLATOR_LISTENER (Mark_engraver, mark);
+void
+Mark_engraver::listen_mark (Stream_event *ev)
 {
-  mark_ev_ = r;
-  return true;
+  ASSIGN_EVENT_ONCE (mark_ev_, ev);
 }
 
 /*
@@ -138,18 +164,24 @@ Mark_engraver::process_music ()
     }
 }
 
-#include "translator.icc"
-
-ADD_ACKNOWLEDGER (Mark_engraver, break_aligned);
+ADD_ACKNOWLEDGER (Mark_engraver, break_alignment);
 
 ADD_TRANSLATOR (Mark_engraver,
-		/* doc */ "This engraver will create 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-location",
-		/* create */ "RehearsalMark",
-		/* accept */ "mark-event",
-		/* read */ "rehearsalMark rehearsalMarkAlignSymbol markFormatter stavesFound",
-		/* write */ "");
+		/* 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 */
+		"RehearsalMark ",
+
+		/* read */
+		"markFormatter "
+		"rehearsalMark "
+		"stavesFound ",
+		
+		/* write */
+		""
+		);