release: 1.5.29

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

diff --git a/lily/script-column.cc b/lily/script-column.cc
index d9da8bc7894ed639114731250fa01f31c06c0100..f41264760c97e342ae1892d0bd3674cb361b47e5 100644 (file)
--- a/lily/script-column.cc
+++ b/lily/script-column.cc
@@ -1,78 +1,81 @@
 /*   
-  g-script-column.cc --  implement Script_column
+  script-column.cc --  implement Script_column
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include "script-column.hh"
-#include "staff-side.hh"
-#include "dimension-cache.hh"
+#include "side-position-interface.hh"
+#include "warn.hh"
 #include "group-interface.hh"
 
 void
-Script_column::add_staff_sided (Item *i)
+Script_column::add_staff_sided (Grob *me, Item *i)
 {
-  SCM p = i->get_elt_property ("script-priority");
-  if (p == SCM_UNDEFINED)
+  SCM p = i->get_grob_property ("script-priority");
+  if (!gh_number_p (p))
     return;
-  
 
-  Group_interface gi (this, "scripts");
-  gi.add_element (i);
+  Pointer_group_interface::add_grob (me, ly_symbol2scm ("scripts"),i);
   
-  add_dependency (i);
-}
-
-Script_column::Script_column ()
-{
-  set_elt_property ("scripts", SCM_EOL);  
+  me->add_dependency (i);
 }
 
 static int
-staff_side_compare (Item * const &i1,
-                   Item * const &i2)
+staff_side_compare (Grob * const &i1,
+                   Grob * const &i2)
 {
-  SCM p1 = i1->get_elt_property ("script-priority");
-  SCM p2 = i2->get_elt_property ("script-priority");
+  SCM p1 = i1->get_grob_property ("script-priority");
+  SCM p2 = i2->get_grob_property ("script-priority");
 
   return gh_scm2int (p1) - gh_scm2int (p2);
 }
 
-void
-Script_column::do_pre_processing ()
+MAKE_SCHEME_CALLBACK (Script_column,before_line_breaking,1);
+
+SCM
+Script_column::before_line_breaking (SCM smob)
 {
-  Drul_array<Link_array<Item> > arrs;
-  Link_array<Item> staff_sided 
-    = Group_interface__extract_elements (this, (Item*)0, "scripts");
+  Grob* me = unsmob_grob (smob);
+  Drul_array<Link_array<Grob> > arrs;
+  Link_array<Grob> staff_sided 
+    = Pointer_group_interface__extract_grobs (me, (Grob*)0, "scripts");
                                     
                                     
   for (int i=0; i < staff_sided.size (); i++)
     {
-      Side_position_interface st (staff_sided[i]);
-      arrs[st.get_direction ()].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<Item> &arr(arrs[d]);
+    Link_array<Grob> &arr (arrs[d]);
     
     arr.sort (staff_side_compare);
 
-    Item * last = 0;
+    Grob * last = 0;
     for (int i=0; i < arr.size (); i++)
       {
-       Side_position_interface s (arr[i]);
+
        if (last)
-         {
-           s.add_support (last);
-         }
+         Side_position_interface::add_support (arr[i],last);
            
-       arr[i]->remove_elt_property ("script-priority");
+       arr[i]->remove_grob_property ("script-priority");
        last = arr[i];
       }
     
   } while (flip (&d) != DOWN);
+
+  return SCM_UNSPECIFIED;
 }