release: 1.3.72

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

diff --git a/lily/script-column.cc b/lily/script-column.cc
index 6fabed4d90bc0eeaec360e1a95975a17722deb96..15b2eb58e982dee8397e0d2548a80b99cdc395bf 100644 (file)
--- a/lily/script-column.cc
+++ b/lily/script-column.cc
@@ -3,76 +3,73 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include "script-column.hh"
-#include "staff-side.hh"
-#include "dimension-cache.hh"
+#include "side-position-interface.hh"
 
-static Staff_side_item *
-get_Staff_side (Item *i)
-{
-  Graphical_element *e1 = i->parent_l(Y_AXIS);
-
-  return dynamic_cast<Staff_side_item*>(e1);
-}
+#include "group-interface.hh"
 
 void
-Script_column::add_staff_sided (Item *i)
+Script_column::add_staff_sided (Score_element *me, Item *i)
 {
-  SCM p = get_Staff_side (i)->get_elt_property ("script-priority");
-  if (p == SCM_UNDEFINED)
+  SCM p = i->get_elt_property ("script-priority");
+  if (!gh_number_p (p))
     return;
+
+  Pointer_group_interface gi (me, "scripts");
+  gi.add_element (i);
   
-  staff_sided_item_l_arr_.push (i);
-  add_dependency (i);
+  me->add_dependency (i);
 }
 
 static int
-staff_side_compare (Item * const &i1,
-                   Item * const &i2)
+staff_side_compare (Score_element * const &i1,
+                   Score_element * const &i2)
 {
-  Score_element *e1 = get_Staff_side (i1);
-  Score_element *e2 = get_Staff_side (i2);
-
-  SCM p1 = e1->get_elt_property ("script-priority");
-  SCM p2 = e2->get_elt_property ("script-priority");
+  SCM p1 = i1->get_elt_property ("script-priority");
+  SCM p2 = i2->get_elt_property ("script-priority");
 
   return gh_scm2int (p1) - gh_scm2int (p2);
 }
 
-void
-Script_column::do_pre_processing ()
-{
-  Drul_array<Link_array<Item> > arrs;
+MAKE_SCHEME_CALLBACK(Script_column,before_line_breaking);
 
-  for (int i=0; i < staff_sided_item_l_arr_.size (); i++)
+SCM
+Script_column::before_line_breaking (SCM smob)
+{
+  Score_element* me = unsmob_element (smob);
+  Drul_array<Link_array<Score_element> > arrs;
+  Link_array<Score_element> staff_sided 
+    = Pointer_group_interface__extract_elements (me, (Score_element*)0, "scripts");
+                                    
+                                    
+  for (int i=0; i < staff_sided.size (); i++)
     {
-      Staff_side_item * ip = get_Staff_side (staff_sided_item_l_arr_[i]);
-      arrs[ip->get_direction ()].push (staff_sided_item_l_arr_[i]);
+      arrs[Side_position::get_direction (staff_sided[i])]
+       .push (staff_sided[i]);
     }
 
   Direction d = DOWN;
   do {
-    Link_array<Item> &arr(arrs[d]);
+    Link_array<Score_element> &arr(arrs[d]);
     
     arr.sort (staff_side_compare);
 
-    Item * last = 0;
+    Score_element * last = 0;
     for (int i=0; i < arr.size (); i++)
       {
-       Staff_side_item * gs = get_Staff_side (arr[i]);
+
        if (last)
-         {
-           gs->add_support (last);
-           gs->add_support (get_Staff_side (last));
-         }
+         Side_position::add_support( arr[i],last);
            
-       gs->remove_elt_property ("script-priority");
+       arr[i]->remove_elt_property ("script-priority");
        last = arr[i];
       }
     
   } while (flip (&d) != DOWN);
+
+  return SCM_UNSPECIFIED;
 }