X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmark-engraver.cc;h=70115d62fdcd5de334cb2acda79ceb9a49e41747;hb=0dc1f8a5fe729cd646213d3fb621df96f1405460;hp=a770cf2001c28093ac517e43daa63ef1ed55c541;hpb=2c22efe5a46a37065b10c3f51c5d7db00d07d318;p=lilypond.git

diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index a770cf2001..70115d62fd 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--2006 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,21 @@
 */
 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:
-  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_TRANSLATOR_LISTENER (mark);
+  DECLARE_ACKNOWLEDGER (break_alignment);
+  DECLARE_ACKNOWLEDGER (break_aligned);
 };
 
 Mark_engraver::Mark_engraver ()
@@ -42,35 +52,56 @@ 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_bar_line (Grob_info inf)
+Mark_engraver::acknowledge_break_aligned (Grob_info inf)
 {
   Grob *s = inf.grob ();
-  if (text_)
+  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))
     {
       /*
-	TODO: make this configurable. RehearsalMark cannot be
-	break-aligned, since the width of the object should not be taken
-	into alignment considerations.
+	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)
+{
+  Grob *s = inf.grob ();
+  if (text_
+      && dynamic_cast<Item *> (s))
+    {
+      text_->set_parent (s, X_AXIS);
+    }
+}
+
+
 void
 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;
 }
 
 void
-Mark_engraver::create_items (Music *ev)
+Mark_engraver::create_items (Stream_event *ev)
 {
   if (text_)
     return;
@@ -78,11 +109,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);
 }
 
 /*
@@ -130,9 +161,9 @@ Mark_engraver::process_music ()
     }
 }
 
-#include "translator.icc"
+ADD_ACKNOWLEDGER (Mark_engraver, break_aligned);
+ADD_ACKNOWLEDGER (Mark_engraver, break_alignment);
 
-ADD_ACKNOWLEDGER (Mark_engraver, bar_line);
 ADD_TRANSLATOR (Mark_engraver,
 		/* doc */ "This engraver will create RehearsalMark objects. "
 		"It puts them on top of all staves (which is taken from "
@@ -140,7 +171,12 @@ ADD_TRANSLATOR (Mark_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 markFormatter stavesFound",
+		/* read */
+		"markFormatter "
+		"rehearsalMark "
+		"stavesFound ",
+		
 		/* write */ "");