release: 1.5.29

[lilypond.git] / lily / script.cc

diff --git a/lily/script.cc b/lily/script.cc
index 2a43afc1340f8a26b171985080eb492529c63327..44ee942f2a71775b14010fa5223d8d14379423b9 100644 (file)
--- a/lily/script.cc
+++ b/lily/script.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -22,15 +22,15 @@ Script::get_molecule (Grob * me, Direction d)
   SCM s = me->get_grob_property ("molecule");
   assert (gh_pair_p (s));
 
-  SCM key = gh_car (s);
+  SCM key = ly_car (s);
   if (key == ly_symbol2scm ("feta"))
     {
       return Font_interface::get_default_font (me)->find_by_name ("scripts-" +
-                                   ly_scm2string (index_cell (gh_cdr (s), d)));
+                                   ly_scm2string (index_cell (ly_cdr (s), d)));
     }
   else if (key == ly_symbol2scm ("accordion"))
     {
-      return Lookup::accordion (gh_cdr (s), 1.0, Font_interface::get_default_font (me));
+      return Lookup::accordion (ly_cdr (s), 1.0, Font_interface::get_default_font (me));
     }
   else
     assert (false);