* input/regression/finger-chords.ly (texidoc): new file.

[lilypond.git] / lily / script.cc

diff --git a/lily/script.cc b/lily/script.cc
index 7a8630dd7c0485de154cc68bcd4cd5f9d4931a33..69f9325094d2dafc19dc37dfaf6b4abb888a6d28 100644 (file)
--- a/lily/script.cc
+++ b/lily/script.cc
@@ -27,10 +27,13 @@ Script_interface::get_molecule (Grob * me, Direction d)
   SCM key = ly_car (s);
   if (key == ly_symbol2scm ("feta"))
     {
+      SCM name_entry = ly_cdr (s);
+
+      SCM str = (gh_pair_p (name_entry)) ? index_get_cell (name_entry, d) :  name_entry;
       return Font_interface::get_default_font (me)->find_by_name ("scripts-" +
-                                   ly_scm2string (index_get_cell (ly_cdr (s), d)));
+                                                                 ly_scm2string (str));
     }
-  else if (key == ly_symbol2scm ("accordion"))
+ else if (key == ly_symbol2scm ("accordion"))
     {
       return Lookup::accordion (ly_cdr (s), 1.0, Font_interface::get_default_font (me));
     }
@@ -107,5 +110,5 @@ ADD_INTERFACE (Text_script,"text-script-interface",
 
 ADD_INTERFACE (Script_interface, "script-interface",
   "",
-  "script-priority script-molecule staff-support");
+  "script-priority script-molecule");