/*
- volta-engraver.cc -- implement Volta_engraver
+ This file is part of LilyPond, the GNU music typesetter.
- source file of the GNU LilyPond music typesetter
+ Copyright (C) 2000--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
- (c) 2000--2007 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ LilyPond is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
*/
#include "engraver.hh"
-#include "bar-line.hh"
+#include "axis-group-interface.hh"
#include "context.hh"
#include "grob-array.hh"
#include "international.hh"
void process_music ();
Moment started_mom_;
- Spanner *volta_span_;
- Spanner *end_volta_span_;
+ Spanner *volta_bracket_;
+ Spanner *end_volta_bracket_;
+ Spanner *volta_spanner_;
SCM start_string_;
};
Volta_engraver::Volta_engraver ()
{
start_string_ = SCM_EOL;
- volta_span_ = 0;
- end_volta_span_ = 0;
+ volta_bracket_ = 0;
+ end_volta_bracket_ = 0;
+ volta_spanner_ = 0;
}
void
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_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);
+ }
cs = scm_cdr (cs);
}
- if (volta_span_)
+ if (volta_bracket_)
{
SCM l (get_property ("voltaSpannerDuration"));
Moment now = now_mom ();
- bool early_stop = unsmob_moment (l)
- && *unsmob_moment (l) <= now - started_mom_;
+ bool early_stop = Moment::unsmob (l)
+ && *Moment::unsmob (l) <= now - started_mom_;
end = end || early_stop;
}
- if (end && !volta_span_)
+ if (end && !volta_bracket_)
/* fixme: be more verbose. */
warning (_ ("cannot end volta spanner"));
else if (end)
{
- end_volta_span_ = volta_span_;
- volta_span_ = 0;
+ end_volta_bracket_ = volta_bracket_;
+ volta_bracket_ = 0;
}
- if (volta_span_
+ if (volta_bracket_
&& (scm_is_string (start_string_) || scm_is_pair (start_string_)))
{
warning (_ ("already have a volta spanner, ending that one prematurely"));
- if (end_volta_span_)
- {
- warning (_ ("also already have an ended spanner"));
- warning (_ ("giving up"));
- return;
- }
+ if (end_volta_bracket_)
+ {
+ warning (_ ("also already have an ended spanner"));
+ warning (_ ("giving up"));
+ return;
+ }
- end_volta_span_ = volta_span_;
- volta_span_ = 0;
+ end_volta_bracket_ = volta_bracket_;
+ volta_bracket_ = 0;
}
- if (!volta_span_
+ if (!volta_bracket_
&& Text_interface::is_markup (start_string_))
{
started_mom_ = now_mom ();
- volta_span_ = make_spanner ("VoltaBracket", SCM_EOL);
+ volta_bracket_ = make_spanner ("VoltaBracket", SCM_EOL);
+
+ volta_bracket_->set_property ("text", start_string_);
+
+ if (!volta_spanner_)
+ volta_spanner_ = make_spanner ("VoltaBracketSpanner", SCM_EOL);
- volta_span_->set_property ("text", start_string_);
+ Axis_group_interface::add_element (volta_spanner_, volta_bracket_);
}
}
void
Volta_engraver::acknowledge_bar_line (Grob_info i)
{
- if (volta_span_)
- Volta_bracket_interface::add_bar (volta_span_, i.item ());
- if (end_volta_span_)
- Volta_bracket_interface::add_bar (end_volta_span_, i.item ());
+ if (volta_bracket_)
+ Volta_bracket_interface::add_bar (volta_bracket_, i.item ());
+ if (end_volta_bracket_)
+ Volta_bracket_interface::add_bar (end_volta_bracket_, i.item ());
+
+ if (volta_spanner_)
+ Side_position_interface::add_support (volta_spanner_, i.grob ());
}
void
Volta_engraver::stop_translation_timestep ()
{
- if (end_volta_span_ && !end_volta_span_->get_bound (RIGHT))
- {
- Grob *cc = unsmob_grob (get_property ("currentCommandColumn"));
- Item *ci = dynamic_cast<Item *> (cc);
- end_volta_span_->set_bound (RIGHT, ci);
- }
+ Grob *cc = Grob::unsmob (get_property ("currentCommandColumn"));
+ Item *ci = dynamic_cast<Item *> (cc);
- if (end_volta_span_)
- for (SCM s = get_property ("stavesFound"); scm_is_pair (s); s = scm_cdr (s))
- Side_position_interface::add_support (end_volta_span_, unsmob_grob (scm_car (s)));
+ if (end_volta_bracket_ && !end_volta_bracket_->get_bound (RIGHT))
+ end_volta_bracket_->set_bound (RIGHT, ci);
- end_volta_span_ = 0;
+ if (volta_spanner_ && end_volta_bracket_)
+ volta_spanner_->set_bound (RIGHT, end_volta_bracket_->get_bound (RIGHT));
- if (volta_span_ && !volta_span_->get_bound (LEFT))
+ if (end_volta_bracket_ && !volta_bracket_)
{
- Grob *cc = unsmob_grob (get_property ("currentCommandColumn"));
- Item *ci = dynamic_cast<Item *> (cc);
- volta_span_->set_bound (LEFT, ci);
+ for (SCM s = get_property ("stavesFound"); scm_is_pair (s); s = scm_cdr (s))
+ Side_position_interface::add_support (volta_spanner_, Grob::unsmob (scm_car (s)));
+ volta_spanner_ = 0;
}
+
+ end_volta_bracket_ = 0;
+
+ if (volta_bracket_ && !volta_bracket_->get_bound (LEFT))
+ volta_bracket_->set_bound (LEFT, ci);
+
+ if (volta_spanner_ && volta_bracket_ && !volta_spanner_->get_bound (LEFT))
+ volta_spanner_->set_bound (LEFT, volta_bracket_->get_bound (LEFT));
}
/*
*/
ADD_ACKNOWLEDGER (Volta_engraver, bar_line);
ADD_TRANSLATOR (Volta_engraver,
- /* doc */ "Make volta brackets.",
- /* create */ "VoltaBracket",
- /* read */ "repeatCommands voltaSpannerDuration stavesFound",
- /* write */ "");
+ /* doc */
+ "Make volta brackets.",
+
+ /* create */
+ "VoltaBracket "
+ "VoltaBracketSpanner ",
+
+ /* read */
+ "repeatCommands "
+ "voltaSpannerDuration "
+ "stavesFound ",
+
+ /* write */
+ ""
+ );
projects / lilypond.git / blobdiff