/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1998--2011 Jan Nieuwenhuizen <janneke@gnu.org>
+ Copyright (C) 1998--2015 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
static bool
safe_is_member (SCM scm, SCM lst)
{
- return scm_list_p (lst) == SCM_BOOL_T
- && scm_member (scm, lst) != SCM_BOOL_F;
+ return ly_is_list (lst) && scm_is_true (scm_member (scm, lst));
}
void
Grob *g = info.grob ();
if (text_
- && g->get_property ("break-align-symbol")
- == ly_symbol2scm ("staff-bar"))
+ && scm_is_eq (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_
+ && 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);
}
+ if (bar_ || support_)
+ text_->set_property ("non-musical", SCM_BOOL_T);
}
void
if (text_)
for (SCM s = text_->get_property ("non-break-align-symbols");
- scm_is_pair (s);
- s = scm_cdr (s))
+ scm_is_pair (s);
+ s = scm_cdr (s))
if (g->internal_has_interface (scm_car (s)))
- text_->set_parent (g, X_AXIS);
+ text_->set_parent (g, X_AXIS);
}
void
if (text_)
{
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);
+ && 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
-
- Align the metronome mark over the time signature (or the
- first notational element of the measure if no time
- signature is present in that measure).
- */
- if (Grob *mc = unsmob_grob (get_property ("currentMusicalColumn")))
- text_->set_parent (mc, X_AXIS);
- else if (Grob *cc = unsmob_grob (get_property ("currentCommandColumn")))
- text_->set_parent (cc, X_AXIS);
- }
+ {
+ /*
+ Gardner Read "Music Notation", p.278
+
+ Align the metronome mark over the time signature (or the
+ first notational element of the measure if no time
+ signature is present in that measure).
+ */
+ if (Grob *mc = unsmob<Grob> (get_property ("currentMusicalColumn")))
+ text_->set_parent (mc, X_AXIS);
+ else if (Grob *cc = unsmob<Grob> (get_property ("currentCommandColumn")))
+ text_->set_parent (cc, X_AXIS);
+ }
text_->set_object ("side-support-elements",
- grob_list_to_grob_array (get_property ("stavesFound")));
+ grob_list_to_grob_array (get_property ("stavesFound")));
text_ = 0;
support_ = 0;
bar_ = 0;
SCM proc = get_property ("metronomeMarkFormatter");
SCM result = scm_call_2 (proc,
- tempo_ev_->self_scm (),
- context ()->self_scm ());
+ tempo_ev_->self_scm (),
+ context ()->self_scm ());
text_->set_property ("text", result);
}
ADD_ACKNOWLEDGER (Metronome_mark_engraver, grob);
ADD_TRANSLATOR (Metronome_mark_engraver,
- /* doc */
- "Engrave metronome marking. This delegates the formatting"
- " work to the function in the @code{metronomeMarkFormatter}"
- " property. The mark is put over all staves. The staves are"
- " taken from the @code{stavesFound} property, which is"
- " maintained by @ref{Staff_collecting_engraver}.",
-
- /* create */
- "MetronomeMark ",
-
- /* read */
- "currentCommandColumn "
- "currentMusicalColumn "
- "metronomeMarkFormatter "
- "stavesFound "
- "tempoHideNote ",
-
- /* write */
- ""
- );
+ /* doc */
+ "Engrave metronome marking. This delegates the formatting"
+ " work to the function in the @code{metronomeMarkFormatter}"
+ " property. The mark is put over all staves. The staves are"
+ " taken from the @code{stavesFound} property, which is"
+ " maintained by @ref{Staff_collecting_engraver}.",
+
+ /* create */
+ "MetronomeMark ",
+
+ /* read */
+ "currentCommandColumn "
+ "currentMusicalColumn "
+ "metronomeMarkFormatter "
+ "stavesFound "
+ "tempoHideNote ",
+
+ /* write */
+ ""
+ );