Fix [a8 a32].

[lilypond.git] / lily / script.cc

diff --git a/lily/script.cc b/lily/script.cc
index 50946ff65d7b1d07da4753dbf4d1af1a4a9852ea..7a8630dd7c0485de154cc68bcd4cd5f9d4931a33 100644 (file)
--- a/lily/script.cc
+++ b/lily/script.cc
@@ -7,7 +7,7 @@
   
  */
 
-#include "debug.hh"
+#include "warn.hh"
 #include "script.hh"
 #include "font-interface.hh"
 #include "side-position-interface.hh"
@@ -15,6 +15,8 @@
 #include "item.hh"
 #include "molecule.hh"
 #include "lookup.hh"
+#include "stem.hh"
+#include "note-column.hh"
 
 Molecule
 Script_interface::get_molecule (Grob * me, Direction d)
@@ -26,7 +28,7 @@ Script_interface::get_molecule (Grob * me, Direction d)
   if (key == ly_symbol2scm ("feta"))
     {
       return Font_interface::get_default_font (me)->find_by_name ("scripts-" +
-                                   ly_scm2string (index_cell (ly_cdr (s), d)));
+                                   ly_scm2string (index_get_cell (ly_cdr (s), d)));
     }
   else if (key == ly_symbol2scm ("accordion"))
     {
@@ -48,15 +50,24 @@ Script_interface::before_line_breaking (SCM smob)
 
   if (!d)
     {
-  /*
-    we should not have `arbitrary' directions. 
-   */
+      /*
+       we should not have `arbitrary' directions. 
+      */
       programming_error ("Script direction not yet known!");
       d = DOWN;
     }
   
   Side_position_interface::set_direction (me,d);
 
+  if (Grob * par = me->get_parent (X_AXIS))
+    {
+      Grob * stem = Note_column::get_stem (par);
+      if (stem && Stem::first_head (stem))
+       {
+         me->set_parent (Stem::first_head (stem), X_AXIS);
+       }
+    }
+  
   return SCM_UNSPECIFIED;
 }