* THANKS: Create skeleton for 2.1.

[lilypond.git] / lily / script.cc

diff --git a/lily/script.cc b/lily/script.cc
index 7483b07a79318cdf30cac54eb54d4cdc9a52c0ff..72d022130980d65d8d2ccb7b1a4fc676d6472df0 100644 (file)
--- a/lily/script.cc
+++ b/lily/script.cc
@@ -3,11 +3,11 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
-#include "debug.hh"
+#include "warn.hh"
 #include "script.hh"
 #include "font-interface.hh"
 #include "side-position-interface.hh"
@@ -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_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));
     }
@@ -61,7 +64,7 @@ Script_interface::before_line_breaking (SCM smob)
 
   if (Grob * par = me->get_parent (X_AXIS))
     {
-      Grob * stem = Note_column::stem_l (par);
+      Grob * stem = Note_column::get_stem (par);
       if (stem && Stem::first_head (stem))
        {
          me->set_parent (Stem::first_head (stem), X_AXIS);
@@ -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");