patch::: 1.3.18.jcn3

[lilypond.git] / lily / script.cc

diff --git a/lily/script.cc b/lily/script.cc
index 430b03acfe385711c9486e82106729dc5564982e..c3dc48943d012e6670296c15216633d951573428 100644 (file)
--- a/lily/script.cc
+++ b/lily/script.cc
@@ -10,7 +10,7 @@
 #include "debug.hh"
 #include "script.hh"
 #include "lookup.hh"
-#include "staff-side.hh"
+#include "side-position-interface.hh"
 #include "paper-def.hh"
 #include "dimension-cache.hh"
 
@@ -19,9 +19,9 @@ Molecule
 Script::get_molecule(Direction d) const
 {
   SCM s = get_elt_property ("molecule");
-  assert (s != SCM_UNDEFINED);
+  assert (gh_pair_p (s));
 
-  SCM key = SCM_CAR (s);
+  SCM key = gh_car  (s);
   if (key == ly_symbol2scm ("feta"))
     {
       return lookup_l ()->afm_find ("scripts-" +