/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1998--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1998--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
void
New_fingering_engraver::acknowledge_inline_accidental (Grob_info inf)
{
- accidentals_.push_back(inf.grob ());
+ accidentals_.push_back (inf.grob ());
}
void
for (SCM s = arts; scm_is_pair (s); s = scm_cdr (s))
{
- Stream_event *ev = unsmob_stream_event (scm_car (s));
+ Stream_event *ev = Stream_event::unsmob (scm_car (s));
if (!ev)
continue;
else if (ev->in_event_class ("script-event"))
add_script (inf.grob (), ev, note_ev);
else if (ev->in_event_class ("string-number-event"))
- {
+ {
// String numbers are used in calculating harmonics even
// when we don't want them displayed. So don't make space
// for them if 'stencil is #f
Grob *g = make_item ("StringNumber", ev->self_scm ());
if (g->get_property ("stencil") != SCM_BOOL_F)
add_fingering (inf.grob (),
- ly_symbol2scm ("StringNumber"), &string_numbers_,
- ev, note_ev);
+ ly_symbol2scm ("StringNumber"), &string_numbers_,
+ ev, note_ev);
g->suicide (); // Kill grob created to check stencil
}
else if (ev->in_event_class ("stroke-finger-event"))
else if (ev->in_event_class ("harmonic-event"))
{
inf.grob ()->set_property ("style", ly_symbol2scm ("harmonic"));
- Grob *d = unsmob_grob (inf.grob ()->get_object ("dot"));
+ Grob *d = Grob::unsmob (inf.grob ()->get_object ("dot"));
if (d && !to_boolean (get_property ("harmonicDots")))
d->suicide ();
}
vector<Finger_tuple> *scripts)
{
for (vsize i = 0; i < scripts->size (); i++)
- if (stem_ && to_boolean (scripts->at (i).script_->get_property ("add-stem-support")))
- Side_position_interface::add_support (scripts->at (i).script_, stem_);
+ if (stem_)
+ {
+ Side_position_interface::add_support (scripts->at (i).script_, stem_);
+ if (Grob *flag = Grob::unsmob (stem_->get_object ("flag")))
+ Side_position_interface::add_support (scripts->at (i).script_, flag);
+ }
/*
This is not extremely elegant, but we have to do a little
f->set_parent (ft.head_, Y_AXIS);
f->set_property ("avoid-slur", ly_symbol2scm ("inside"));
if (hordir == LEFT
- && unsmob_grob (ft.head_->get_object ("accidental-grob")))
+ && Grob::unsmob (ft.head_->get_object ("accidental-grob")))
Side_position_interface::add_support (f,
- unsmob_grob (ft.head_->get_object ("accidental-grob")));
- else if (unsmob_grob (ft.head_->get_object ("dot")))
+ Grob::unsmob (ft.head_->get_object ("accidental-grob")));
+ else if (Grob::unsmob (ft.head_->get_object ("dot")))
Side_position_interface::add_support (f,
- unsmob_grob (ft.head_->get_object ("dot")));
+ Grob::unsmob (ft.head_->get_object ("dot")));
- Self_alignment_interface::set_align_self (f, Y_AXIS);
- Self_alignment_interface::set_center_parent (f, Y_AXIS);
+ Self_alignment_interface::set_aligned_on_parent (f, Y_AXIS);
Side_position_interface::set_axis (f, X_AXIS);
f->set_property ("direction", scm_from_int (hordir));
}
- Direction d = DOWN;
Drul_array< vector<Finger_tuple> > vertical (down, up);
- do
+ for (DOWN_and_UP (d))
{
for (vsize i = 0; i < vertical[d].size (); i++)
{
f->set_property ("script-priority",
scm_from_int (finger_prio + d * ft.position_));
- Self_alignment_interface::set_align_self (f, X_AXIS);
- Self_alignment_interface::set_center_parent (f, X_AXIS);
+ Self_alignment_interface::set_aligned_on_parent (f, X_AXIS);
Side_position_interface::set_axis (f, Y_AXIS);
f->set_property ("direction", scm_from_int (d));
}
}
- while (flip (&d) != DOWN);
}
void