/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2000--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 2000--2015 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
#include "engraver.hh"
#include "axis-group-interface.hh"
-#include "bar-line.hh"
#include "context.hh"
#include "grob-array.hh"
#include "international.hh"
TRANSLATOR_DECLARATIONS (Volta_engraver);
protected:
- DECLARE_ACKNOWLEDGER (bar_line);
+ void acknowledge_bar_line (Grob_info);
virtual void derived_mark () const;
void stop_translation_timestep ();
SCM c = scm_car (cs);
if (scm_is_pair (c)
- && scm_car (c) == ly_symbol2scm ("volta")
- && scm_is_pair (scm_cdr (c)))
- {
- if (scm_cadr (c) == SCM_BOOL_F)
- end = true;
- else
- start_string_ = scm_cadr (c);
- }
+ && scm_is_eq (scm_car (c), ly_symbol2scm ("volta"))
+ && scm_is_pair (scm_cdr (c)))
+ {
+ if (scm_is_false (scm_cadr (c)))
+ end = true;
+ else
+ start_string_ = scm_cadr (c);
+ }
cs = scm_cdr (cs);
}
SCM l (get_property ("voltaSpannerDuration"));
Moment now = now_mom ();
- bool early_stop = unsmob_moment (l)
- && *unsmob_moment (l) <= now - started_mom_;
+ bool early_stop = unsmob<Moment> (l)
+ && *unsmob<Moment> (l) <= now - started_mom_;
end = end || early_stop;
}
warning (_ ("already have a volta spanner, ending that one prematurely"));
if (end_volta_bracket_)
- {
- warning (_ ("also already have an ended spanner"));
- warning (_ ("giving up"));
- return;
- }
+ {
+ warning (_ ("also already have an ended spanner"));
+ warning (_ ("giving up"));
+ return;
+ }
end_volta_bracket_ = volta_bracket_;
volta_bracket_ = 0;
volta_bracket_->set_property ("text", start_string_);
if (!volta_spanner_)
- volta_spanner_ = make_spanner ("VoltaBracketSpanner", SCM_EOL);
+ volta_spanner_ = make_spanner ("VoltaBracketSpanner", SCM_EOL);
Axis_group_interface::add_element (volta_spanner_, volta_bracket_);
}
void
Volta_engraver::stop_translation_timestep ()
{
- Grob *cc = unsmob_grob (get_property ("currentCommandColumn"));
+ Grob *cc = unsmob<Grob> (get_property ("currentCommandColumn"));
Item *ci = dynamic_cast<Item *> (cc);
if (end_volta_bracket_ && !end_volta_bracket_->get_bound (RIGHT))
if (end_volta_bracket_ && !volta_bracket_)
{
for (SCM s = get_property ("stavesFound"); scm_is_pair (s); s = scm_cdr (s))
- Side_position_interface::add_support (volta_spanner_, unsmob_grob (scm_car (s)));
+ Side_position_interface::add_support (volta_spanner_, unsmob<Grob> (scm_car (s)));
volta_spanner_ = 0;
}
/*
TODO: should attach volta to paper-column if no bar is found.
*/
-ADD_ACKNOWLEDGER (Volta_engraver, bar_line);
+void
+Volta_engraver::boot ()
+{
+ ADD_ACKNOWLEDGER (Volta_engraver, bar_line);
+}
+
ADD_TRANSLATOR (Volta_engraver,
- /* doc */
- "Make volta brackets.",
+ /* doc */
+ "Make volta brackets.",
- /* create */
- "VoltaBracket "
- "VoltaBracketSpanner ",
+ /* create */
+ "VoltaBracket "
+ "VoltaBracketSpanner ",
- /* read */
- "repeatCommands "
- "voltaSpannerDuration "
- "stavesFound ",
+ /* read */
+ "repeatCommands "
+ "voltaSpannerDuration "
+ "stavesFound ",
- /* write */
- ""
- );
+ /* write */
+ ""
+ );