/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1997--2012 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
/* Cancel any ongoing crescendo, either explicitly by \! or
implicitly by a new crescendo. Also avoid warning if cresc is
- cancelled both implicitly and explicitly. */
+ canceled both implicitly and explicitly. */
if ((d == STOP || current_cresc_ev_) && !accepted_spanevents_drul_[STOP])
ASSIGN_EVENT_ONCE (accepted_spanevents_drul_[STOP], ev);
}
Axis_group_interface::add_element (line_spanner_, script_);
}
- Stream_event *stop_ev = accepted_spanevents_drul_ [STOP]
- ? accepted_spanevents_drul_[STOP] : script_ev_;
-
if (accepted_spanevents_drul_[STOP] || script_ev_)
{
/*
current_cresc_ev_ = 0;
}
else if (accepted_spanevents_drul_[STOP])
- {
- accepted_spanevents_drul_[STOP]->origin ()->warning (_ ("cannot find start of (de)crescendo"));
- stop_ev = 0;
- }
+ accepted_spanevents_drul_[STOP]->origin ()->warning (_ ("cannot find start of (de)crescendo"));
}
if (accepted_spanevents_drul_[START])
TODO: Use symbols.
*/
- SCM start_sym = current_cresc_ev_->get_property ("class");
+ SCM start_sym = scm_car (current_cresc_ev_->get_property ("class"));
string start_type;
if (start_sym == ly_symbol2scm ("decrescendo-event"))