release: 1.3.10

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

diff --git a/lily/script-column.cc b/lily/script-column.cc
index cc38a6eae80bde7795ce18d82ecbc493fe7b3a9a..d9da8bc7894ed639114731250fa01f31c06c0100 100644 (file)
--- a/lily/script-column.cc
+++ b/lily/script-column.cc
@@ -9,48 +9,49 @@
 #include "script-column.hh"
 #include "staff-side.hh"
 #include "dimension-cache.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)
 {
-  SCM p = get_Staff_side (i)->get_elt_property (script_priority_scm_sym);
-  if (p == SCM_BOOL_F)
+  SCM p = i->get_elt_property ("script-priority");
+  if (p == SCM_UNDEFINED)
     return;
   
-  staff_sided_item_l_arr_.push (i);
+
+  Group_interface gi (this, "scripts");
+  gi.add_element (i);
+  
   add_dependency (i);
 }
 
+Script_column::Script_column ()
+{
+  set_elt_property ("scripts", SCM_EOL);  
+}
+
 static int
 staff_side_compare (Item * const &i1,
                    Item * const &i2)
 {
-  Score_element *e1 = get_Staff_side (i1);
-  Score_element *e2 = get_Staff_side (i2);
+  SCM p1 = i1->get_elt_property ("script-priority");
+  SCM p2 = i2->get_elt_property ("script-priority");
 
-  SCM p1 = e1->get_elt_property (script_priority_scm_sym);
-  SCM p2 = e2->get_elt_property (script_priority_scm_sym);
-
-  return gh_scm2int (SCM_CDR(p1)) - gh_scm2int (SCM_CDR(p2));
+  return gh_scm2int (p1) - gh_scm2int (p2);
 }
 
 void
 Script_column::do_pre_processing ()
 {
   Drul_array<Link_array<Item> > arrs;
-
-  for (int i=0; i < staff_sided_item_l_arr_.size (); i++)
+  Link_array<Item> staff_sided 
+    = Group_interface__extract_elements (this, (Item*)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->dir_].push (staff_sided_item_l_arr_[i]);
+      Side_position_interface st (staff_sided[i]);
+      arrs[st.get_direction ()].push (staff_sided[i]);
     }
 
   Direction d = DOWN;
@@ -62,16 +63,16 @@ Script_column::do_pre_processing ()
     Item * last = 0;
     for (int i=0; i < arr.size (); i++)
       {
-       Staff_side_item * gs = get_Staff_side (arr[i]);
+       Side_position_interface s (arr[i]);
        if (last)
          {
-           gs->add_support (last);
-           gs->add_support (get_Staff_side (last));
+           s.add_support (last);
          }
            
-       gs->remove_elt_property (script_priority_scm_sym);
+       arr[i]->remove_elt_property ("script-priority");
        last = arr[i];
       }
     
   } while (flip (&d) != DOWN);
 }
+