/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1998--2010 Jan Nieuwenhuizen <janneke@gnu.org>
+ Copyright (C) 1998--2011 Jan Nieuwenhuizen <janneke@gnu.org>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include "duration.hh"
#include "grob-array.hh"
#include "item.hh"
+#include "music.hh"
#include "stream-event.hh"
#include "text-interface.hh"
protected:
Item *text_;
Grob *support_;
+ Grob *bar_;
SCM last_duration_;
SCM last_count_;
SCM last_text_;
DECLARE_ACKNOWLEDGER (break_aligned);
+ DECLARE_ACKNOWLEDGER (break_alignment);
DECLARE_ACKNOWLEDGER (grob);
protected:
{
text_ = 0;
support_ = 0;
+ bar_ = 0;
last_duration_ = SCM_EOL;
last_count_ = SCM_EOL;
last_text_ = SCM_EOL;
scm_gc_mark (last_text_);
}
+static bool
+safe_is_member (SCM scm, SCM lst)
+{
+ return scm_list_p (lst) == SCM_BOOL_T
+ && scm_member (scm, lst) != SCM_BOOL_F;
+}
+
void
Metronome_mark_engraver::acknowledge_break_aligned (Grob_info info)
{
Grob *g = info.grob ();
if (text_
- && !support_
- && scm_member (g->get_property_data ("break-align-symbol"),
- text_->get_property_data ("break-align-symbols"))
- != SCM_BOOL_F)
+ && g->get_property ("break-align-symbol")
+ == ly_symbol2scm ("staff-bar"))
+ bar_ = g;
+ else if (text_
+ && !support_
+ && safe_is_member (g->get_property ("break-align-symbol"),
+ text_->get_property ("break-align-symbols"))
+ && Item::break_visible (g))
{
support_ = g;
text_->set_parent (g, X_AXIS);
}
}
-SCM
-grob_name_scm (Grob *g)
+void
+Metronome_mark_engraver::acknowledge_break_alignment (Grob_info info)
{
- SCM name_pair = scm_assq (ly_symbol2scm ("name"), g->get_property ("meta"));
- return scm_is_pair (name_pair) ? scm_cdr (name_pair) : SCM_EOL;
+ Grob *g = info.grob ();
+
+ if (text_
+ && support_
+ && dynamic_cast<Item *> (g))
+ text_->set_parent (g, X_AXIS);
}
void
{
Grob *g = info.grob ();
- if (text_
- && !support_
- && scm_member (grob_name_scm (g),
- text_->get_property_data ("non-break-align-symbols"))
- != SCM_BOOL_F)
- {
- text_->set_parent (g, X_AXIS);
- }
+ if (text_)
+ for (SCM s = text_->get_property ("non-break-align-symbols");
+ scm_is_pair (s);
+ s = scm_cdr (s))
+ if (g->internal_has_interface (scm_car (s)))
+ text_->set_parent (g, X_AXIS);
}
void
{
if (text_)
{
- if (!support_)
+ if (text_->get_parent (X_AXIS)
+ && text_->get_parent (X_AXIS)->internal_has_interface (ly_symbol2scm ("multi-measure-rest-interface"))
+ && bar_)
+ text_->set_parent (bar_, X_AXIS);
+ else if (!support_)
{
/*
Gardner Read "Music Notation", p.278
grob_list_to_grob_array (get_property ("stavesFound")));
text_ = 0;
support_ = 0;
+ bar_ = 0;
}
}
SCM duration = get_property ("tempoUnitDuration");
SCM text = get_property ("tempoText");
- if ( ( (unsmob_duration (duration) && scm_is_number (count))
+ if ( ( (unsmob_duration (duration) && scm_is_true (count))
|| Text_interface::is_markup (text) )
&& !(ly_is_equal (count, last_count_)
&& ly_is_equal (duration, last_duration_)
ADD_ACKNOWLEDGER (Metronome_mark_engraver, break_aligned);
+ADD_ACKNOWLEDGER (Metronome_mark_engraver, break_alignment);
ADD_ACKNOWLEDGER (Metronome_mark_engraver, grob);
ADD_TRANSLATOR (Metronome_mark_engraver,