X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscript-interface.cc;h=c9442fe9aefe9033696651291e2836f6333c0f97;hb=ca016880c383a964f3d3542cfba64ada0e1d41cd;hp=b30363ebcc81a6006150df86d562109b1c5e8215;hpb=5bbfc22fce036b9b69df5e420de93e11da23c05e;p=lilypond.git

diff --git a/lily/script-interface.cc b/lily/script-interface.cc
index b30363ebcc..c9442fe9ae 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--2014 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,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)
@@ -110,8 +110,8 @@ Script_interface::calc_cross_staff (SCM smob)
   Grob *slur = Grob::unsmob (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;
@@ -153,11 +153,13 @@ ADD_INTERFACE (Script_interface,
                "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 "
               );