bool start = false;
bool end = false;
bool volta_found = false;
- while (gh_pair_p (cs))
+ while (ly_pair_p (cs))
{
SCM command = ly_car (cs);
if (command == ly_symbol2scm ("start-repeat"))
start = true;
else if (command == ly_symbol2scm ("end-repeat"))
end = true;
- else if (gh_pair_p (command) && ly_car (command) == ly_symbol2scm ("volta"))
+ else if (ly_pair_p (command) && ly_car (command) == ly_symbol2scm ("volta"))
volta_found = true;
cs = ly_cdr (cs);
}
*/
SCM wb = get_property ("whichBar");
SCM db = get_property ("defaultBarType");
- if (!gh_string_p (wb) || gh_equal_p (db, wb))
+ if (!ly_string_p (wb) || ly_equal_p (db, wb))
{
- if (s != "" || (volta_found && !gh_string_p (wb)))
+ if (s != "" || (volta_found && !ly_string_p (wb)))
{
daddy_context_->set_property ("whichBar", scm_makfrom0str (s.to_str0 ()));
}