#include "directional-element-interface.hh"
#include "engraver.hh"
#include "event.hh"
-#include "new-slur.hh"
+#include "slur.hh"
#include "note-column.hh"
#include "paper-column.hh"
#include "rhythmic-head.hh"
if (g->internal_get_property (sym) == SCM_EOL)
{
SCM entry = scm_assoc (sym, alist);
- if (ly_c_pair_p (entry))
+ if (scm_is_pair (entry))
g->internal_set_property (sym, ly_cdr (entry));
}
}
SCM follow_scm = scm_assoc (ly_symbol2scm ("follow-into-staff"),
art);
- *follow = ly_c_pair_p (follow_scm) && to_boolean (ly_cdr (follow_scm));
+ *follow = scm_is_pair (follow_scm) && to_boolean (ly_cdr (follow_scm));
bool priority_found = false ;
- for (SCM s = art ; ly_c_pair_p (s); s = ly_cdr (s))
+ for (SCM s = art ; scm_is_pair (s); s = ly_cdr (s))
{
SCM sym = ly_caar (s);
SCM type = scm_object_property (sym, ly_symbol2scm ("backend-type?"));
/* Make sure they're in order of user input by adding index i.
Don't use the direction in this priority. Smaller means closer
to the head. */
- int prio = ly_scm2int (val) + index;
+ int prio = scm_to_int (val) + index;
val = scm_int2num (prio);
e->set_parent (info.grob_, X_AXIS);
}
}
- else if (New_slur::has_interface (info.grob_))
+ else if (Slur::has_interface (info.grob_))
slur_ = dynamic_cast<Spanner*> (info.grob_);
}
/* descr */ "Handles note scripted articulations.",
/* creats*/ "Script",
/* accepts */ "script-event articulation-event",
-/* acks */ "stem-interface rhythmic-head-interface\
- new-slur-interface note-column-interface",
+/* acks */ "stem-interface rhythmic-head-interface "
+ "slur-interface note-column-interface",
/* reads */ "scriptDefinitions",
/* write */ "");