-/*
- volta-engraver.cc -- implement Volta_engraver
-
+/*
+ volta-engraver.cc -- implement Volta_engraver
+
source file of the GNU LilyPond music typesetter
-
- (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-
- */
+
+ (c) 2000--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
#include "engraver.hh"
-#include "translator-group.hh"
-#include "volta-spanner.hh"
-#include "item.hh"
+
+#include "axis-group-interface.hh"
+#include "bar-line.hh"
+#include "context.hh"
+#include "grob-array.hh"
+#include "international.hh"
#include "note-column.hh"
-#include "bar.hh"
+#include "item.hh"
#include "side-position-interface.hh"
+#include "staff-symbol.hh"
+#include "text-interface.hh"
+#include "volta-bracket.hh"
+#include "warn.hh"
+
+#include "translator.icc"
/*
Create Volta spanners, by reading repeatCommands property, usually
- set by Unfolded_repeat_iterator.
- */
+ set by Volta_repeat_iterator.
+*/
class Volta_engraver : public Engraver
{
public:
- Volta_engraver();
- VIRTUAL_COPY_CONS(Translator);
+ TRANSLATOR_DECLARATIONS (Volta_engraver);
protected:
- virtual void acknowledge_element (Score_element_info);
- virtual void do_removal_processing ();
- virtual void do_pre_move_processing ();
- virtual void do_process_music ();
+ DECLARE_ACKNOWLEDGER (bar_line);
+
+ virtual void derived_mark () const;
+ void stop_translation_timestep ();
+ void process_music ();
Moment started_mom_;
- Spanner * volta_span_p_;
- Spanner* end_volta_span_p_;
+ Spanner *volta_bracket_;
+ Spanner *end_volta_bracket_;
+ Spanner *volta_spanner_;
+ SCM start_string_;
};
-ADD_THIS_TRANSLATOR(Volta_engraver);
+void
+Volta_engraver::derived_mark () const
+{
+ scm_gc_mark (start_string_);
+}
Volta_engraver::Volta_engraver ()
{
- volta_span_p_ = 0;
- end_volta_span_p_ = 0;
+ start_string_ = SCM_EOL;
+ volta_bracket_ = 0;
+ end_volta_bracket_ = 0;
+ volta_spanner_ = 0;
}
void
-Volta_engraver::do_process_music ()
+Volta_engraver::process_music ()
{
SCM cs = get_property ("repeatCommands");
- SCM str = SCM_EOL;
bool end = false;
- while (gh_pair_p (cs))
+ start_string_ = SCM_EOL;
+ while (scm_is_pair (cs))
{
- SCM c = gh_car (cs);
+ SCM c = scm_car (cs);
- if (gh_pair_p (c) && gh_car (c) == ly_symbol2scm ("volta"))
+ if (scm_is_pair (c)
+ && scm_car (c) == ly_symbol2scm ("volta")
+ && scm_is_pair (scm_cdr (c)))
{
- if (gh_cadr (c) == SCM_BOOL_F)
+ if (scm_cadr (c) == SCM_BOOL_F)
end = true;
else
- str = gh_cadr (c);
+ start_string_ = scm_cadr (c);
}
-
- cs = gh_cdr (cs);
- }
- SCM l (get_property ("voltaSpannerDuration"));
- Moment now = now_mom ();
-
- bool early_stop = volta_span_p_ && unsmob_moment (l)
- &&*unsmob_moment (l) <= now - started_mom_;
+ cs = scm_cdr (cs);
+ }
- if (end || early_stop)
+ if (volta_bracket_)
{
- end_volta_span_p_ = volta_span_p_;
- volta_span_p_ =0;
+ SCM l (get_property ("voltaSpannerDuration"));
+ Moment now = now_mom ();
- /*
- maybe do typeset_element () directly?
- */
+ bool early_stop = unsmob_moment (l)
+ && *unsmob_moment (l) <= now - started_mom_;
- if (!gh_string_p (str))
- end_volta_span_p_->set_elt_property ("last-volta", SCM_BOOL_T);
+ end = end || early_stop;
+ }
+
+ if (end && !volta_bracket_)
+ /* fixme: be more verbose. */
+ warning (_ ("cannot end volta spanner"));
+ else if (end)
+ {
+ end_volta_bracket_ = volta_bracket_;
+ volta_bracket_ = 0;
}
- if (gh_string_p (str))
+ if (volta_bracket_
+ && (scm_is_string (start_string_) || scm_is_pair (start_string_)))
{
- started_mom_ = now;
- if (volta_span_p_)
+ warning (_ ("already have a volta spanner, ending that one prematurely"));
+
+ if (end_volta_bracket_)
{
- warning (_ ("Already have a volta spanner. Stopping that one prematurely."));
+ warning (_ ("also already have an ended spanner"));
+ warning (_ ("giving up"));
+ return;
+ }
- if (end_volta_span_p_)
- {
- warning (_("Also have a stopped spanner. Giving up."));
+ end_volta_bracket_ = volta_bracket_;
+ volta_bracket_ = 0;
+ }
- return ;
+ if (!volta_bracket_
+ && Text_interface::is_markup (start_string_))
+ {
+ started_mom_ = now_mom ();
- }
+ volta_bracket_ = make_spanner ("VoltaBracket", SCM_EOL);
-
- end_volta_span_p_ = volta_span_p_;
- volta_span_p_ = 0;
- }
+ volta_bracket_->set_property ("text", start_string_);
- volta_span_p_ = new Spanner (get_property ("basicVoltaSpannerProperties"));
- Volta_spanner::set_interface (volta_span_p_);
- announce_element (volta_span_p_,0);
- volta_span_p_->set_elt_property ("text", str);
+ if (!volta_spanner_)
+ volta_spanner_ = make_spanner ("VoltaBracketSpanner", SCM_EOL);
+
+ Axis_group_interface::add_element (volta_spanner_, volta_bracket_);
}
}
void
-Volta_engraver::acknowledge_element (Score_element_info i)
+Volta_engraver::acknowledge_bar_line (Grob_info i)
{
- if (Item* item = dynamic_cast<Item*> (i.elem_l_))
- {
- if (Note_column::has_interface (item))
- {
- if (volta_span_p_)
- Volta_spanner::add_column (volta_span_p_,item);
- if (end_volta_span_p_)
- Volta_spanner::add_column (end_volta_span_p_,item);
- }
- if (Bar::has_interface (item))
- {
- if (volta_span_p_)
- Volta_spanner::add_bar (volta_span_p_, item);
- if (end_volta_span_p_)
- Volta_spanner::add_bar(end_volta_span_p_ , 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::do_removal_processing ()
+Volta_engraver::stop_translation_timestep ()
{
- if (volta_span_p_)
- {
- typeset_element(volta_span_p_);
- }
- if (end_volta_span_p_)
- {
- typeset_element (end_volta_span_p_);
- }
-}
+ Grob *cc = unsmob_grob (get_property ("currentCommandColumn"));
+ Item *ci = dynamic_cast<Item *> (cc);
-void
-Volta_engraver::do_pre_move_processing ()
-{
- if (end_volta_span_p_)
+ if (end_volta_bracket_ && !end_volta_bracket_->get_bound (RIGHT))
+ end_volta_bracket_->set_bound (RIGHT, ci);
+
+ if (volta_spanner_ && end_volta_bracket_)
+ volta_spanner_->set_bound (RIGHT, end_volta_bracket_->get_bound (RIGHT));
+
+ if (end_volta_bracket_ && !volta_bracket_)
{
- Side_position::add_staff_support (end_volta_span_p_);
-
- typeset_element (end_volta_span_p_ );
- end_volta_span_p_ =0;
+ 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)));
+ 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));
}
+
+/*
+ TODO: should attach volta to paper-column if no bar is found.
+*/
+ADD_ACKNOWLEDGER (Volta_engraver, bar_line);
+ADD_TRANSLATOR (Volta_engraver,
+ /* doc */
+ "Make volta brackets.",
+
+ /* create */
+ "VoltaBracket "
+ "VoltaBracketSpanner ",
+
+ /* read */
+ "repeatCommands "
+ "voltaSpannerDuration "
+ "stavesFound ",
+
+ /* write */
+ ""
+ );
projects / lilypond.git / blobdiff