/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2002--2011 Juergen Reuter <reuter@ipd.uka.de>
+ Copyright (C) 2002--2015 Juergen Reuter <reuter@ipd.uka.de>
Han-Wen Nienhuys <hanwen@xs4all.nl
public:
TRANSLATOR_DECLARATIONS (Ambitus_engraver);
protected:
- DECLARE_ACKNOWLEDGER (note_head);
+ void acknowledge_note_head (Grob_info);
void process_music ();
void stop_translation_timestep ();
{
ambitus_ = make_item ("AmbitusLine", SCM_EOL);
group_ = make_item ("Ambitus", SCM_EOL);
- Direction d = DOWN;
- do
+ for (DOWN_and_UP (d))
{
heads_[d] = make_item ("AmbitusNoteHead", SCM_EOL);
accidentals_[d] = make_item ("AmbitusAccidental", SCM_EOL);
Axis_group_interface::add_element (group_, heads_[d]);
Axis_group_interface::add_element (group_, accidentals_[d]);
}
- while (flip (&d) != DOWN);
ambitus_->set_parent (heads_[DOWN], X_AXIS);
Axis_group_interface::add_element (group_, ambitus_);
is_typeset_ = false;
}
-Ambitus_engraver::Ambitus_engraver ()
+Ambitus_engraver::Ambitus_engraver (Context *c)
+ : Engraver (c)
{
ambitus_ = 0;
heads_.set (0, 0);
* may then oversee a clef that is defined in a staff context if
* we are in a voice context; middleCPosition would then be
* assumed to be 0.
+
+ * Don't use middleCPosition as this may be thwarted by a cue
+ * starting here. middleCOffset is not affected by cue clefs.
*/
- start_c0_ = robust_scm2int (get_property ("middleCPosition"), 0);
- start_key_sig_ = get_property ("keySignature");
+ int clef_pos = robust_scm2int (get_property ("middleCClefPosition"), 0);
+ int offset = robust_scm2int (get_property ("middleCOffset"), 0);
+
+ start_c0_ = clef_pos + offset;
+ start_key_sig_ = get_property ("keyAlterations");
is_typeset_ = true;
}
Ambitus_engraver::acknowledge_note_head (Grob_info info)
{
Stream_event *nr = info.event_cause ();
- if (nr && nr->in_event_class ("note-event"))
+ if (nr && nr->in_event_class ("note-event")
+ && !to_boolean (info.grob ()->get_property ("ignore-ambitus")))
{
SCM p = nr->get_property ("pitch");
/*
If the engraver is added to a percussion context,
filter out unpitched note heads.
*/
- if (!unsmob_pitch (p))
+ if (!unsmob<Pitch> (p))
return;
- Pitch pitch = *unsmob_pitch (p);
+ Pitch pitch = *unsmob<Pitch> (p);
Drul_array<bool> expands = pitch_interval_.add_point (pitch);
if (expands[UP])
causes_[UP] = nr;
Grob *accidental_placement
= make_item ("AccidentalPlacement", accidentals_[DOWN]->self_scm ());
- Direction d = DOWN;
- do
+ for (DOWN_and_UP (d))
{
Pitch p = pitch_interval_[d];
heads_[d]->set_property ("cause", causes_[d]->self_scm ());
scm_from_int (p.get_notename ())),
start_key_sig_);
- if (handle == SCM_BOOL_F)
+ if (scm_is_false (handle))
handle = scm_assoc (scm_from_int (p.get_notename ()),
start_key_sig_);
- Rational sig_alter = (handle != SCM_BOOL_F)
+ Rational sig_alter = (scm_is_true (handle))
? robust_scm2rational (scm_cdr (handle), Rational (0))
: Rational (0);
Separation_item::add_conditional_item (heads_[d],
accidental_placement);
Accidental_placement::add_accidental (accidental_placement,
- accidentals_[d]);
+ accidentals_[d], false, 0);
Pointer_group_interface::add_grob (ambitus_,
ly_symbol2scm ("note-heads"),
heads_[d]);
}
- while (flip (&d) != DOWN);
Axis_group_interface::add_element (group_, accidental_placement);
}
else
{
- Direction d = DOWN;
- do
+ for (DOWN_and_UP (d))
{
accidentals_[d]->suicide ();
heads_[d]->suicide ();
}
- while (flip (&d) != DOWN);
ambitus_->suicide ();
}
}
-ADD_ACKNOWLEDGER (Ambitus_engraver, note_head);
+void
+Ambitus_engraver::boot ()
+{
+ ADD_ACKNOWLEDGER (Ambitus_engraver, note_head);
+}
+
ADD_TRANSLATOR (Ambitus_engraver,
/* doc */
"Create an ambitus.",
"AmbitusNoteHead ",
/* read */
- "keySignature "
- "middleCPosition ",
+ "keyAlterations "
+ "middleCClefPosition "
+ "middleCOffset ",
/* write */
""