* scm/output-gnome.scm (FIXME-glyph-string): New function. Cannot

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

diff --git a/lily/script-interface.cc b/lily/script-interface.cc
index c13ddf876429b5856c0afe8f73b182b02229c695..f23cc9c21f950aa9b133abb803202a95c1b3e138 100644 (file)
--- a/lily/script-interface.cc
+++ b/lily/script-interface.cc
@@ -13,8 +13,6 @@
 #include "font-interface.hh"
 #include "side-position-interface.hh"
 #include "output-def.hh"
-#include "item.hh"
-#include "stencil.hh"
 #include "lookup.hh"
 #include "stem.hh"
 #include "note-column.hh"
@@ -25,17 +23,17 @@ Script_interface::get_stencil (Grob *me, Direction d)
   SCM s = me->get_property ("script-stencil");
   assert (scm_is_pair (s));
 
-  SCM key = ly_car (s);
+  SCM key = scm_car (s);
   if (key == ly_symbol2scm ("feta"))
     {
-      SCM name_entry = ly_cdr (s);
+      SCM name_entry = scm_cdr (s);
       SCM str = ((scm_is_pair (name_entry)) ? index_get_cell (name_entry, d)
                 : name_entry);
       return Font_interface::get_default_font (me)
-       ->find_by_name ("scripts-" + ly_scm2string (str));
+       ->find_by_name ("scripts." + ly_scm2string (str));
     }
   else if (key == ly_symbol2scm ("accordion"))
-    return Lookup::accordion (ly_cdr (s), 1.0,
+    return Lookup::accordion (scm_cdr (s), 1.0,
                              Font_interface::get_default_font (me));
   else
     assert (false);
@@ -74,7 +72,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 = Side_position_interface::get_direction (me);
   if (!dir)
@@ -100,5 +98,5 @@ ADD_INTERFACE (Text_script,"text-script-interface",
  */
 ADD_INTERFACE (Script_interface, "script-interface",
   "An object that is put above or below a note",
-  "add-stem-support slur script-priority script-stencil inside-slur");
+  "add-stem-support slur-padding slur script-priority script-stencil inside-slur");