VIRTUAL_COPY_CONS(Translator);
protected:
- virtual void acknowledge_element (Score_element_info);
- virtual void do_removal_processing ();
- virtual void do_pre_move_processing ();
- virtual void do_process_music ();
-
+ virtual void acknowledge_grob (Grob_info);
+ virtual void finalize ();
+ virtual void stop_translation_timestep ();
+ virtual void process_music ();
+ virtual void create_grobs ();
+
Moment started_mom_;
- Spanner * volta_span_p_;
- Spanner* end_volta_span_p_;
+ Spanner *volta_span_p_;
+ Spanner *end_volta_span_p_;
+
+ SCM start_str_;
};
ADD_THIS_TRANSLATOR(Volta_engraver);
end_volta_span_p_ = 0;
}
+
void
-Volta_engraver::do_process_music ()
+Volta_engraver::process_music ()
{
SCM cs = get_property ("repeatCommands");
- SCM str = SCM_EOL;
- bool end = false;
+ bool end = false;
+ start_str_ = SCM_EOL;
while (gh_pair_p (cs))
{
SCM c = gh_car (cs);
if (gh_cadr (c) == SCM_BOOL_F)
end = true;
else
- str = gh_cadr (c);
+ start_str_ = gh_cadr (c);
}
cs = gh_cdr (cs);
}
- SCM l (get_property ("voltaSpannerDuration"));
- Moment now = now_mom ();
+ if (volta_span_p_)
+ {
+ SCM l (get_property ("voltaSpannerDuration"));
+ Moment now = now_mom ();
- bool early_stop = volta_span_p_ && 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;
+ }
+
if (end && !volta_span_p_)
{
warning (_("No volta spanner to end")); // fixme: be more verbose.
}
- else if (end || early_stop)
+ else if (end)
{
end_volta_span_p_ = volta_span_p_;
volta_span_p_ =0;
/*
- maybe do typeset_element () directly?
+ maybe do typeset_grob () directly?
*/
- if (!gh_string_p (str))
- end_volta_span_p_->set_elt_property ("last-volta", SCM_BOOL_T);
+ if (!gh_string_p (start_str_))
+ end_volta_span_p_->set_grob_property ("last-volta", SCM_BOOL_T);
}
- if (gh_string_p (str))
+ if (gh_string_p (start_str_) && volta_span_p_)
{
- started_mom_ = now;
- if (volta_span_p_)
+ warning (_ ("Already have a volta spanner. Stopping that one prematurely."));
+
+ if (end_volta_span_p_)
{
- warning (_ ("Already have a volta spanner. Stopping that one prematurely."));
-
- if (end_volta_span_p_)
- {
- warning (_("Also have a stopped spanner. Giving up."));
-
- return ;
+ warning (_ ("Also have a stopped spanner. Giving up."));
+ return ;
+ }
- }
+ end_volta_span_p_ = volta_span_p_;
+ volta_span_p_ = 0;
+ }
+}
-
- end_volta_span_p_ = volta_span_p_;
- volta_span_p_ = 0;
- }
+/*
+ this could just as well be done in process_music (), but what the hack.
+ */
+void
+Volta_engraver::create_grobs ()
+{
+ if (!volta_span_p_ && gh_string_p (start_str_))
+ {
+ started_mom_ = now_mom () ;
volta_span_p_ = new Spanner (get_property ("VoltaBracket"));
Volta_spanner::set_interface (volta_span_p_);
- announce_element (volta_span_p_,0);
- volta_span_p_->set_elt_property ("text", str);
+ announce_grob (volta_span_p_,0);
+ volta_span_p_->set_grob_property ("text", start_str_);
}
}
void
-Volta_engraver::acknowledge_element (Score_element_info i)
+Volta_engraver::acknowledge_grob (Grob_info i)
{
if (Item* item = dynamic_cast<Item*> (i.elem_l_))
{
}
void
-Volta_engraver::do_removal_processing ()
+Volta_engraver::finalize ()
{
if (volta_span_p_)
{
- typeset_element(volta_span_p_);
+ typeset_grob(volta_span_p_);
}
if (end_volta_span_p_)
{
- typeset_element (end_volta_span_p_);
+ typeset_grob (end_volta_span_p_);
}
}
+
+
void
-Volta_engraver::do_pre_move_processing ()
+Volta_engraver::stop_translation_timestep ()
{
if (end_volta_span_p_)
{
Side_position::add_staff_support (end_volta_span_p_);
- typeset_element (end_volta_span_p_ );
+ typeset_grob (end_volta_span_p_ );
end_volta_span_p_ =0;
}
}
+
+/*
+ TODO: should attach volta to paper-column if no bar is found.
+ */