SCM last_text_;
DECLARE_ACKNOWLEDGER (break_aligned);
+ DECLARE_ACKNOWLEDGER (break_alignment);
DECLARE_ACKNOWLEDGER (grob);
protected:
else if (text_
&& !support_
&& safe_is_member (g->get_property ("break-align-symbol"),
- text_->get_property ("break-align-symbols")))
- {
- support_ = g;
- text_->set_parent (g, X_AXIS);
- }
+ text_->get_property ("break-align-symbols"))
+ && Item::break_visible (g))
+ support_ = g;
}
-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)
- ? ly_camel_case_2_lisp_identifier (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_
- && safe_is_member (grob_name_scm (g),
- text_->get_property ("non-break-align-symbols")))
- 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
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,