release commit

[lilypond.git] / lily / script-engraver.cc

diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc
index 3b952933cb823f6700d9447a5791bccc5dee4654..0bb713d5819204926eba4218f292ca8ad5092126 100644 (file)
--- a/lily/script-engraver.cc
+++ b/lily/script-engraver.cc
@@ -10,7 +10,7 @@
 #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"
@@ -80,7 +80,7 @@ copy_property (Grob *g, SCM sym, SCM alist)
   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));
     }
 }
@@ -110,10 +110,10 @@ void make_script_from_event (Grob *p, bool * follow, Context *tg,
   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?"));
@@ -128,7 +128,7 @@ void make_script_from_event (Grob *p, bool * follow, Context *tg,
          /* 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);
@@ -244,7 +244,7 @@ ENTER_DESCRIPTION (Script_engraver,
 /* 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 */       "");