bool
Volta_engraver::staff_eligible ()
{
- /*
- UGH.
- */
- if (!unsmob_grob (staff_))
- return true;
-
- if (!to_boolean (get_property ("voltaOnThisStaff")))
+ SCM doit =get_property ("voltaOnThisStaff");
+ if (scm_is_bool (doit))
{
- /*
- TODO: this does weird things when you open a piece with a
- volta spanner.
-
- */
- SCM staffs = get_property ("stavesFound");
+ return to_boolean (doit);
+ }
- /*
- only put a volta on the top staff.
+
+ if (!unsmob_grob (staff_))
+ return false;
+
+ /*
+ TODO: this does weird things when you open a piece with a
+ volta spanner.
+ */
+ SCM staffs = get_property ("stavesFound");
+
+ /*
+ only put a volta on the top staff.
- May be this is a bit convoluted, and we should have a single
- volta engraver in score context or somesuch.
+ May be this is a bit convoluted, and we should have a single
+ volta engraver in score context or somesuch.
- */
- if (!ly_c_pair_p (staffs))
- {
- programming_error ("Huh? Volta engraver can't find staffs?");
- return false;
- }
- else if (ly_car (scm_last_pair (staffs)) != staff_)
- {
- return false;
- }
+ */
+ if (!scm_is_pair (staffs))
+ {
+ programming_error ("Huh? Volta engraver can't find staffs?");
+ return false;
+ }
+ else if (scm_car (scm_last_pair (staffs)) != staff_)
+ {
+ return false;
}
return true;
}
+
void
Volta_engraver::process_music ()
{
bool end = false;
start_string_ = SCM_EOL;
- while (ly_c_pair_p (cs))
+ while (scm_is_pair (cs))
{
- SCM c = ly_car (cs);
+ SCM c = scm_car (cs);
- if (ly_c_pair_p (c)
- && ly_car (c) == ly_symbol2scm ("volta")
- && ly_c_pair_p (ly_cdr (c)))
+ if (scm_is_pair (c)
+ && scm_car (c) == ly_symbol2scm ("volta")
+ && scm_is_pair (scm_cdr (c)))
{
- if (ly_cadr (c) == SCM_BOOL_F)
+ if (scm_cadr (c) == SCM_BOOL_F)
end = true;
else
- start_string_ = ly_cadr (c);
+ start_string_ = scm_cadr (c);
}
- cs = ly_cdr (cs);
+ cs = scm_cdr (cs);
}
if (volta_span_)
}
if (volta_span_ &&
- (ly_c_string_p (start_string_) || ly_c_pair_p (start_string_)))
+ (scm_is_string (start_string_) || scm_is_pair (start_string_)))
{
warning (_ ("Already have a volta spanner. Stopping that one prematurely."));
}
if (!volta_span_ &&
- (ly_c_string_p (start_string_) || ly_c_pair_p (start_string_)))
+ (scm_is_string (start_string_) || scm_is_pair (start_string_)))
{
started_mom_ = now_mom () ;
volta_span_ = 0;
}
+ 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);
+ }
+
end_volta_span_ =0;
+
+ if (volta_span_ && !volta_span_->get_bound (LEFT))
+ {
+ Grob * cc = unsmob_grob (get_property ("currentCommandColumn"));
+ Item * ci = dynamic_cast<Item*> (cc);
+ volta_span_->set_bound (LEFT, ci);
+ }
+
}
/*
*/
ENTER_DESCRIPTION (Volta_engraver,
-/* descr */ "Make volta brackets",
+/* descr */ "Make volta brackets.",
/* creats*/ "VoltaBracket",
/* accepts */ "",
/* acks */ "bar-line-interface staff-symbol-interface note-column-interface",