X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscript-interface.cc;h=24fe4dc0824ed063beb72142f10cae86a46d5f72;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=c4a136b06f20e15de8ebd09dd17515bd9ecbc7c9;hpb=d2762a4f1add2bb04d6fc34d3c7ae03eeb7d500f;p=lilypond.git

diff --git a/lily/script-interface.cc b/lily/script-interface.cc
index c4a136b06f..24fe4dc082 100644
--- a/lily/script-interface.cc
+++ b/lily/script-interface.cc
@@ -36,7 +36,7 @@ Script_interface::get_stencil (Grob *me, Direction d)
   assert (scm_is_pair (s));
 
   SCM key = scm_car (s);
-  if (key == ly_symbol2scm ("feta"))
+  if (scm_is_eq (key, ly_symbol2scm ("feta")))
     {
       SCM name_entry = scm_cdr (s);
       SCM str = ((scm_is_pair (name_entry)) ? index_get_cell (name_entry, d)
@@ -54,7 +54,7 @@ MAKE_SCHEME_CALLBACK (Script_interface, calc_positioning_done, 1);
 SCM
 Script_interface::calc_positioning_done (SCM smob)
 {
-  Grob *me = Grob::unsmob (smob);
+  Grob *me = unsmob<Grob> (smob);
   if (Grob *par = me->get_parent (X_AXIS))
     {
       Grob *stem = Note_column::get_stem (par);
@@ -73,7 +73,7 @@ Script_interface::get_direction (Grob *me)
     relative_dir = to_dir (reldir);
 
   SCM other_elt = me->get_object ("direction-source");
-  Grob *e = Grob::unsmob (other_elt);
+  Grob *e = unsmob<Grob> (other_elt);
   if (e)
     return (Direction) (relative_dir * get_grob_direction (e));
 
@@ -84,7 +84,7 @@ MAKE_SCHEME_CALLBACK (Script_interface, calc_direction, 1);
 SCM
 Script_interface::calc_direction (SCM smob)
 {
-  Grob *me = Grob::unsmob (smob);
+  Grob *me = unsmob<Grob> (smob);
   Direction d = Script_interface::get_direction (me);
 
   if (!d)
@@ -101,17 +101,17 @@ MAKE_SCHEME_CALLBACK (Script_interface, calc_cross_staff, 1);
 SCM
 Script_interface::calc_cross_staff (SCM smob)
 {
-  Grob *me = Grob::unsmob (smob);
+  Grob *me = unsmob<Grob> (smob);
   Grob *stem = Note_column::get_stem (me->get_parent (X_AXIS));
 
   if (stem && to_boolean (stem->get_property ("cross-staff")))
     return SCM_BOOL_T;
 
-  Grob *slur = Grob::unsmob (me->get_object ("slur"));
+  Grob *slur = unsmob<Grob> (me->get_object ("slur"));
   SCM avoid_slur = me->get_property ("avoid-slur");
   if (slur && to_boolean (slur->get_property ("cross-staff"))
-      && (avoid_slur == ly_symbol2scm ("outside")
-          || avoid_slur == ly_symbol2scm ("around")))
+      && (scm_is_eq (avoid_slur, ly_symbol2scm ("outside"))
+          || scm_is_eq (avoid_slur, ly_symbol2scm ("around"))))
     return SCM_BOOL_T;
 
   return SCM_BOOL_F;
@@ -122,7 +122,7 @@ MAKE_SCHEME_CALLBACK (Script_interface, print, 1);
 SCM
 Script_interface::print (SCM smob)
 {
-  Grob *me = Grob::unsmob (smob);
+  Grob *me = unsmob<Grob> (smob);
 
   Direction dir = get_grob_direction (me);
 
@@ -131,7 +131,6 @@ Script_interface::print (SCM smob)
 
 struct Text_script
 {
-  DECLARE_GROB_INTERFACE ();
 };
 
 ADD_INTERFACE (Text_script,