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

diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index 92bf4952c2..8cd1b80515 100644
--- a/lily/mark-engraver.cc
+++ b/lily/mark-engraver.cc
@@ -3,17 +3,25 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2008 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include <cctype>
+using namespace std;
 
+#include "engraver.hh"
+
+#include "axis-group-interface.hh"
 #include "bar-line.hh"
 #include "context.hh"
-#include "engraver-group-engraver.hh"
+#include "grob-array.hh"
+#include "international.hh"
 #include "item.hh"
-#include "warn.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,
@@ -21,19 +29,20 @@
 */
 class Mark_engraver : public Engraver
 {
+
+  void create_items (Stream_event *);
+  Item *text_;
+  Stream_event *mark_ev_;
+
 public:
   TRANSLATOR_DECLARATIONS (Mark_engraver);
+
 protected:
-  Item *text_;
-protected:
-  virtual void stop_translation_timestep ();
-  virtual void acknowledge_grob (Grob_info);
-  void create_items (Music *);
-  virtual bool try_music (Music *ev);
-  virtual void process_music ();
-
-private:
-  Music *mark_ev_;
+  void process_music ();
+  void stop_translation_timestep ();
+
+  DECLARE_TRANSLATOR_LISTENER (mark);
+  DECLARE_ACKNOWLEDGER (break_alignment);
 };
 
 Mark_engraver::Mark_engraver ()
@@ -43,34 +52,31 @@ Mark_engraver::Mark_engraver ()
 }
 
 void
-Mark_engraver::acknowledge_grob (Grob_info inf)
+Mark_engraver::acknowledge_break_alignment (Grob_info inf)
 {
   Grob *s = inf.grob ();
-  if (text_ && Bar_line::has_interface (s))
+  if (text_
+      && dynamic_cast<Item *> (s))
     {
-      /*
-	TODO: make this configurable. 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::stop_translation_timestep ()
 {
   if (text_)
-    {
-      SCM lst = get_property ("stavesFound");
-      text_->set_property ("side-support-elements", lst);
-      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;
@@ -78,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);
 }
 
 /*
@@ -101,8 +107,8 @@ Mark_engraver::process_music ()
 
       SCM m = mark_ev_->get_property ("label");
       SCM proc = get_property ("markFormatter");
-      if (!Text_interface::markup_p (m)
-	  && ly_c_procedure_p (proc))
+      if (!Text_interface::is_markup (m)
+	  && ly_is_procedure (proc))
 	{
 	  if (!scm_is_number (m))
 	    m = get_property ("rehearsalMark");
@@ -113,7 +119,7 @@ Mark_engraver::process_music ()
 	      int mark_count = scm_to_int (m);
 	      mark_count++;
 	      context ()->set_property ("rehearsalMark",
-					scm_int2num (mark_count));
+					scm_from_int (mark_count));
 	    }
 
 	  if (scm_is_number (m))
@@ -123,22 +129,31 @@ Mark_engraver::process_music ()
 	    warning (_ ("rehearsalMark must have integer value"));
 	}
 
-      if (Text_interface::markup_p (m))
+      if (Text_interface::is_markup (m))
 	text_->set_property ("text", m);
       else
 	warning (_ ("mark label must be a markup object"));
     }
 }
 
+ADD_ACKNOWLEDGER (Mark_engraver, break_alignment);
+
 ADD_TRANSLATOR (Mark_engraver,
-		/* descr */ "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",
-		/* creats*/ "RehearsalMark",
-		/* accepts */ "mark-event",
-		/* acks  */ "bar-line-interface",
-		/* reads */ "rehearsalMark 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 */
+		""
+		);