-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
-#include "grob.hh"
#include "item.hh"
-#include "spanner.hh"
-#include "system.hh"
+#include "system.hh"
static SCM break_criterion;
void
for (SCM s = grob_list; scm_is_pair (s); s = scm_cdr (s))
{
- SCM n= substitute_grob (unsmob_grob (scm_car (s)));
+ SCM n = substitute_grob (unsmob_grob (scm_car (s)));
if (n != SCM_UNDEFINED)
{
Slice
item_system_range (Item* it)
{
- if (System*st= it->get_system ())
+ if (System*st = it->get_system ())
return Slice (st->rank_, st->rank_);
Slice sr;
if (bi && bi->get_system ())
sr.add_point (bi->get_system ()->rank_);
}
- while (flip (&d)!=LEFT);
+ while (flip (&d)!= LEFT);
return sr;
}
}
Substitution_entry ()
{
- grob_ =0;
+ grob_ = 0;
left_ = right_ = -2;
}
for (int k = 0; k < 2;k++)
for (int j = (*arrs[k])[i][LEFT]; j <= (*arrs[k])[i][RIGHT]; j++)
{
- SCM subs =substitute_grob (vec[j].grob_);
+ SCM subs = substitute_grob (vec[j].grob_);
if (subs!= SCM_UNDEFINED)
{
*tail = scm_cons (subs, SCM_EOL);
sp_indices[i].length () , len -sp_index);
{
- SCM l1 =substitute_grob_list (grob_list);
+ SCM l1 = substitute_grob_list (grob_list);
assert (scm_ilength (l1) == scm_ilength (newval));
}
#endif
SCM
substitute_mutable_property_alist (SCM alist)
{
- SCM grob_list_p = ly_scheme_function ("grob-list?");
+ SCM grob_list_p = ly_lily_module_constant ("grob-list?");
SCM l = SCM_EOL;
SCM *tail = &l;
Spanner*s = this;
bool fast_done = false;
- SCM grob_list_p = ly_scheme_function ("grob-list?");
+ SCM grob_list_p = ly_lily_module_constant ("grob-list?");
if (type == grob_list_p)
fast_done = s->fast_fubstitute_grob_list (sym, val);