release: 1.1.54

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

diff --git a/lily/script-column.cc b/lily/script-column.cc
index adf27dc7a606b296d22c279a02b41a2e5886faf9..a14c02c29ef949f43a6ea8d39184ebbfc4410213 100644 (file)
--- a/lily/script-column.cc
+++ b/lily/script-column.cc
@@ -1,100 +1,76 @@
-/*
-  script-column.cc -- implement Script_column
-
+/*   
+  g-script-column.cc --  implement Script_column
+  
   source file of the GNU LilyPond music typesetter
-
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
-*/
-
+  
+  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  
+ */
 #include "script-column.hh"
-#include "debug.hh"
-#include "script.hh"
-#include "note-head.hh"
-#include "stem.hh"
-
-IMPLEMENT_STATIC_NAME(Script_column);
-IMPLEMENT_IS_TYPE_B1(Script_column,Horizontal_vertical_group_item);
+#include "staff-side.hh"
 
-
-void
-Script_column::add(Script*s_l)
+static Staff_side_item *
+get_Staff_side (Item *i)
 {
-    script_l_arr_.push(s_l);
-    add_element(s_l);
-}
+  Graphical_element *e1 = i->dim_cache_[Y_AXIS]->parent_l_->element_l ();
 
+  return dynamic_cast<Staff_side_item*>(e1);
+}
 
 void
-Script_column::do_print()const
+Script_column::add_staff_sided (Item *i)
 {
-    mtor << "scripts: " << script_l_arr_.size() << '\n'; 
+  SCM p = get_Staff_side (i)->get_elt_property (script_priority_scm_sym);
+  if (p == SCM_BOOL_F)
+    return;
+  
+  staff_sided_item_l_arr_.push (i);
+  add_dependency (i);
 }
+
 static int
-idx(bool inside, int dir)
+staff_side_compare (Item * const &i1,
+                   Item * const &i2)
 {
-    int j = (dir+1);
-    if ( !inside )
-       j ++;
-    return j;
-}
-
-void
-Script_column::do_pre_processing()
-{
-    if (!script_l_arr_.size()) 
-       return;
-    
-    /* up+inside, up+outside, down+inside, down+outside */
-    Array<Script*> placed_l_arr_a[4];
-    for (int i=0; i < script_l_arr_.size(); i++) {
-       Script*s_l = script_l_arr_[i];
-       placed_l_arr_a[idx( s_l->inside_staff_b_ , s_l->dir_i_) ].push(s_l);
-    }
-    
-    for (int j =0; j <4; j++) {
-       placed_l_arr_a[j].sort( Script::compare);
-    }
+  Score_element *e1 = get_Staff_side (i1);
+  Score_element *e2 = get_Staff_side (i2);
 
+  SCM p1 = e1->get_elt_property (script_priority_scm_sym);
+  SCM p2 = e2->get_elt_property (script_priority_scm_sym);
 
-    for (int j =0; j < 4; j++) {
-       if (placed_l_arr_a[j].size())
-           for (int i=0; i  < support_l_arr_.size(); i++)
-               placed_l_arr_a[j][0]->add_support( support_l_arr_[i]);
-    }
-    
-    Item * support_l=0;
-    int j = 0;
-    for (; j < 2; j++ ) {
-       for (int i=0; i < placed_l_arr_a[j].size(); i++) {
-           if (support_l)
-               placed_l_arr_a[j][i]->add_support(support_l);
-           support_l = placed_l_arr_a[j][i];
-       }
-    }
-    support_l = 0;
-    for (; j < 4; j++ ) {
-       for (int i=0; i < placed_l_arr_a[j].size(); i++) {
-           if (support_l)
-               placed_l_arr_a[j][i]->add_support(support_l);
-           support_l = placed_l_arr_a[j][i];
-       }
-    }
+  return gh_scm2int (SCM_CDR(p1)) - gh_scm2int (SCM_CDR(p2));
 }
 
-
 void
-Script_column::add_support(Item*i_l)
+Script_column::do_pre_processing ()
 {
-    support_l_arr_.push(i_l);
-    add_element(i_l);
-}
+  Drul_array<Link_array<Item> > arrs;
 
-void
-Script_column::do_substitute_dependency(Score_elem*o,Score_elem*n)
-{
-    Horizontal_vertical_group::do_substitute_dependency(o,n);
-    if (o->item()) {
-       script_l_arr_.substitute((Script*)o->item(),(Script*) (n?n->item():0));
-       support_l_arr_.substitute(o->item(), (n?n->item():0));
+  for (int i=0; i < staff_sided_item_l_arr_.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]);
     }
+
+  Direction d = DOWN;
+  do {
+    Link_array<Item> &arr(arrs[d]);
+    
+    arr.sort (staff_side_compare);
+
+    Item * 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));
+         }
+           
+       gs->remove_elt_property (script_priority_scm_sym);
+       last = arr[i];
+      }
+    
+  } while (flip (&d) != DOWN);
 }