X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmark-engraver.cc;h=8cd1b8051546511b7fdc6e00e44b9d09a5e60d46;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=cb2ac141d9e975ec9a18e3f5677394b407a77fd2;hpb=9f3572d98bb948c9689cd1f75401a029451fa001;p=lilypond.git

diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index cb2ac141d9..8cd1b80515 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--2008 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include <cctype>
@@ -17,9 +17,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,20 +30,19 @@ using namespace std;
 class Mark_engraver : public Engraver
 {
 
-  void create_items (Music *);
+  void create_items (Stream_event *);
   Item *text_;
-  Music *mark_ev_;
+  Stream_event *mark_ev_;
 
 public:
   TRANSLATOR_DECLARATIONS (Mark_engraver);
 
 protected:
-  virtual bool try_music (Music *ev);
   void process_music ();
   void stop_translation_timestep ();
 
+  DECLARE_TRANSLATOR_LISTENER (mark);
   DECLARE_ACKNOWLEDGER (break_alignment);
-  DECLARE_ACKNOWLEDGER (break_aligned);
 };
 
 Mark_engraver::Mark_engraver ()
@@ -49,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)
 {
@@ -89,16 +67,16 @@ 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;
 }
 
 void
-Mark_engraver::create_items (Music *ev)
+Mark_engraver::create_items (Stream_event *ev)
 {
   if (text_)
     return;
@@ -106,11 +84,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);
 }
 
 /*
@@ -158,24 +136,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",
+		/* 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",
-		/* accept */ "mark-event",
+		/* create */
+		"RehearsalMark ",
+
 		/* read */
 		"markFormatter "
 		"rehearsalMark "
 		"stavesFound ",
 		
-		/* write */ "");
+		/* write */
+		""
+		);