X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscript-interface.cc;h=24fe4dc0824ed063beb72142f10cae86a46d5f72;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=8fa8784654225f6fd17ff054a08d60ebd7de1327;hpb=b7a0cffbf9d1069860368f289a5b50e9d1d90ba8;p=lilypond.git

diff --git a/lily/script-interface.cc b/lily/script-interface.cc
index 8fa8784654..24fe4dc082 100644
--- a/lily/script-interface.cc
+++ b/lily/script-interface.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1999--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -36,13 +36,13 @@ 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)
-		 : name_entry);
+                 : name_entry);
       return Font_interface::get_default_font (me)
-	->find_by_name ("scripts." + ly_scm2string (str));
+             ->find_by_name ("scripts." + ly_scm2string (str));
     }
   else
     assert (false);
@@ -54,12 +54,12 @@ MAKE_SCHEME_CALLBACK (Script_interface, calc_positioning_done, 1);
 SCM
 Script_interface::calc_positioning_done (SCM smob)
 {
-  Grob *me = unsmob_grob (smob);
+  Grob *me = unsmob<Grob> (smob);
   if (Grob *par = me->get_parent (X_AXIS))
     {
       Grob *stem = Note_column::get_stem (par);
       if (stem && Stem::first_head (stem))
-	me->set_parent (Stem::first_head (stem), X_AXIS);
+        me->set_parent (Stem::first_head (stem), X_AXIS);
     }
   return SCM_BOOL_T;
 }
@@ -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 = unsmob_grob (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 = unsmob_grob (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 = unsmob_grob (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 = unsmob_grob (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 = unsmob_grob (smob);
+  Grob *me = unsmob<Grob> (smob);
 
   Direction dir = get_grob_direction (me);
 
@@ -131,35 +131,34 @@ Script_interface::print (SCM smob)
 
 struct Text_script
 {
-  DECLARE_GROB_INTERFACE ();
 };
 
 ADD_INTERFACE (Text_script,
-	       "An object that is put above or below a note.",
+               "An object that is put above or below a note.",
 
-	       /* properties */
-	       "add-stem-support "
-	       "avoid-slur "
-	       "script-priority "
-	       "slur "
-	       );
+               /* properties */
+               "avoid-slur "
+               "script-priority "
+               "slur "
+              );
 
 /*
   Hmm. Where should we put add-stem-support ?
 */
 ADD_INTERFACE (Script_interface,
-	       "An object that is put above or below a note.",
-
-	       /* properties */
-	       "add-stem-support "
-	       "avoid-slur "
-	       "direction-source "
-	       "positioning-done "
-	       "script-priority "
-	       "script-stencil "
-	       "side-relative-direction "
-	       "slur "
-	       "slur-padding "
-	       "toward-stem-shift "
-	       );
+               "An object that is put above or below a note.",
+
+               /* properties */
+               "avoid-slur "
+               "direction-source "
+               "positioning-done "
+               "script-column "
+               "script-priority "
+               "script-stencil "
+               "side-relative-direction "
+               "slur "
+               "slur-padding "
+               "toward-stem-shift "
+               "toward-stem-shift-in-column "
+              );