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>
#include "engraver.hh"
+#include "axis-group-interface.hh"
#include "bar-line.hh"
#include "context.hh"
+#include "grob-array.hh"
+#include "international.hh"
#include "item.hh"
-#include "warn.hh"
+#include "stream-event.hh"
#include "text-interface.hh"
-#include "grob-array.hh"
-#include "axis-group-interface.hh"
+#include "warn.hh"
+
+#include "translator.icc"
/**
put stuff over or next to bars. Examples: bar numbers, marginal notes,
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_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_
- && (get_property ("rehearsalMarkAlignSymbol")
- == s->get_property ("break-align-symbol"))
+ && !text_->get_parent (X_AXIS)
+ && (text_->get_property_data ("break-align-symbol")
+ == s->get_property_data ("break-align-symbol"))
&& Axis_group_interface::has_interface (s))
{
/*
}
}
+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 ()
{
}
void
-Mark_engraver::create_items (Music *ev)
+Mark_engraver::create_items (Stream_event *ev)
{
if (text_)
return;
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);
}
/*
}
}
-#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. "
"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",
+ /* read */
+ "markFormatter "
+ "rehearsalMark "
+ "stavesFound ",
+
/* write */ "");