X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmark-engraver.cc;h=689eb490136b73158868c90d6e552cf58130d9fb;hb=1b47523b4b6c3c7f661f17665fe66606a928cfec;hp=6ece619883e79ee50763dfc5f88909023cd76253;hpb=4b975f3177880e16e759f67be4517f67109c2633;p=lilypond.git

diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index 6ece619883..689eb49013 100644
--- a/lily/mark-engraver.cc
+++ b/lily/mark-engraver.cc
@@ -7,13 +7,15 @@
 */
 
 #include <cctype>
+using namespace std;
 
 #include "bar-line.hh"
 #include "context.hh"
-#include "engraver-group-engraver.hh"
+#include "engraver-group.hh"
 #include "item.hh"
 #include "warn.hh"
 #include "text-interface.hh"
+#include "grob-array.hh"
 
 /**
    put stuff over or next to  bars.  Examples: bar numbers, marginal notes,
@@ -21,19 +23,20 @@
 */
 class Mark_engraver : public Engraver
 {
+
+  void create_items (Music *);
+  Item *text_;
+  Music *mark_ev_;
+
 public:
   TRANSLATOR_DECLARATIONS (Mark_engraver);
+
 protected:
-  Item *text_;
-protected:
-  void stop_translation_timestep ();
-  DECLARE_ACKNOWLEDGER(bar_line);
-  void create_items (Music *);
   virtual bool try_music (Music *ev);
   void process_music ();
+  void stop_translation_timestep ();
 
-private:
-  Music *mark_ev_;
+  DECLARE_ACKNOWLEDGER (break_aligned);
 };
 
 Mark_engraver::Mark_engraver ()
@@ -43,10 +46,12 @@ Mark_engraver::Mark_engraver ()
 }
 
 void
-Mark_engraver::acknowledge_bar_line (Grob_info inf)
+Mark_engraver::acknowledge_break_aligned (Grob_info inf)
 {
   Grob *s = inf.grob ();
-  if (text_)
+  if (text_
+      && (get_property ("rehearsalMarkAlignSymbol")
+	  == s->get_property ("break-align-symbol")))
     {
       /*
 	TODO: make this configurable. RehearsalMark cannot be
@@ -62,8 +67,8 @@ Mark_engraver::stop_translation_timestep ()
 {
   if (text_)
     {
-      SCM lst = get_property ("stavesFound");
-      text_->set_object ("side-support-elements", lst);
+      text_->set_object ("side-support-elements",
+			 grob_list_to_grob_array (get_property ("stavesFound")));
       text_ = 0;
     }
   mark_ev_ = 0;
@@ -101,7 +106,7 @@ Mark_engraver::process_music ()
 
       SCM m = mark_ev_->get_property ("label");
       SCM proc = get_property ("markFormatter");
-      if (!Text_interface::markup_p (m)
+      if (!Text_interface::is_markup (m)
 	  && ly_is_procedure (proc))
 	{
 	  if (!scm_is_number (m))
@@ -123,7 +128,7 @@ 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"));
@@ -132,15 +137,16 @@ Mark_engraver::process_music ()
 
 #include "translator.icc"
 
-ADD_ACKNOWLEDGER(Mark_engraver,bar_line);
+ADD_ACKNOWLEDGER (Mark_engraver, break_aligned);
+
 ADD_TRANSLATOR (Mark_engraver,
-		/* descr */ "This engraver will create RehearsalMark objects. "
+		/* 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",
-		/* creats*/ "RehearsalMark",
-		/* accepts */ "mark-event",
-		/* reads */ "rehearsalMark markFormatter stavesFound",
+		/* create */ "RehearsalMark",
+		/* accept */ "mark-event",
+		/* read */ "rehearsalMark rehearsalMarkAlignSymbol markFormatter stavesFound",
 		/* write */ "");