release: 1.5.29

[lilypond.git] / lily / script-column.cc

diff --git a/lily/script-column.cc b/lily/script-column.cc
index 2c7e6b24de0cb88134682909bd4e67768baf8bd2..f41264760c97e342ae1892d0bd3674cb361b47e5 100644 (file)
--- a/lily/script-column.cc
+++ b/lily/script-column.cc
@@ -3,12 +3,12 @@
   
   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>
   
  */
 #include "script-column.hh"
 #include "side-position-interface.hh"
-
+#include "warn.hh"
 #include "group-interface.hh"
 
 void
@@ -18,7 +18,7 @@ Script_column::add_staff_sided (Grob *me, Item *i)
   if (!gh_number_p (p))
     return;
 
-  Pointer_group_interface::add_element (me, "scripts",i);
+  Pointer_group_interface::add_grob (me, ly_symbol2scm ("scripts"),i);
   
   me->add_dependency (i);
 }
@@ -33,7 +33,7 @@ staff_side_compare (Grob * const &i1,
   return gh_scm2int (p1) - gh_scm2int (p2);
 }
 
-MAKE_SCHEME_CALLBACK(Script_column,before_line_breaking,1);
+MAKE_SCHEME_CALLBACK (Script_column,before_line_breaking,1);
 
 SCM
 Script_column::before_line_breaking (SCM smob)
@@ -41,18 +41,25 @@ Script_column::before_line_breaking (SCM smob)
   Grob* me = unsmob_grob (smob);
   Drul_array<Link_array<Grob> > arrs;
   Link_array<Grob> staff_sided 
-    = Pointer_group_interface__extract_elements (me, (Grob*)0, "scripts");
+    = Pointer_group_interface__extract_grobs (me, (Grob*)0, "scripts");
                                     
                                     
   for (int i=0; i < staff_sided.size (); i++)
     {
-      arrs[Side_position::get_direction (staff_sided[i])]
-       .push (staff_sided[i]);
+      Direction d = Side_position_interface::get_direction (staff_sided[i]);
+      if (!d)
+       {
+         programming_error ( "No direction for script?");
+         d = DOWN;
+         staff_sided[i]->set_grob_property ("direction", gh_int2scm (d));
+       }
+      
+      arrs[d].push (staff_sided[i]);
     }
 
   Direction d = DOWN;
   do {
-    Link_array<Grob> &arr(arrs[d]);
+    Link_array<Grob> &arr (arrs[d]);
     
     arr.sort (staff_side_compare);
 
@@ -61,7 +68,7 @@ Script_column::before_line_breaking (SCM smob)
       {
 
        if (last)
-         Side_position::add_support( arr[i],last);
+         Side_position_interface::add_support (arr[i],last);
            
        arr[i]->remove_grob_property ("script-priority");
        last = arr[i];