release: 1.3.72

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

diff --git a/lily/script-column.cc b/lily/script-column.cc
index bfbe2f7be5863b2429c14a822bb18b35d8e97afc..15b2eb58e982dee8397e0d2548a80b99cdc395bf 100644 (file)
--- a/lily/script-column.cc
+++ b/lily/script-column.cc
@@ -1,119 +1,75 @@
-/*
-  script-column.cc -- implement Script_column
-
+/*   
+  g-script-column.cc --  implement Script_column
+  
   source file of the GNU LilyPond music typesetter
-
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-*/
-
+  
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  
+ */
 #include "script-column.hh"
-#include "debug.hh"
-#include "script.hh"
-#include "note-head.hh"
-#include "stem.hh"
-#include "general-script-def.hh"
-
-void
-Script_column::add_script (Script*s_l)
-{
-  script_l_arr_.push (s_l);
-  add_dependency (s_l);
-  add_element (s_l);
-}
-
+#include "side-position-interface.hh"
 
-void
-Script_column::do_print() const
-{
-#ifndef NPRINT
-  DOUT << "scripts: " << script_l_arr_.size() << '\n'; 
-#endif
-}
-
-static int
-idx (bool inside, int dir)
-{
-  int j = (dir+1);
-  if (!inside)
-    j ++;
-  return j;
-}
-
-
-Script_column::Script_column ()
-{
-  set_axes (X_AXIS,X_AXIS);
-}
+#include "group-interface.hh"
 
 void
-Script_column::do_pre_processing()
+Script_column::add_staff_sided (Score_element *me, Item *i)
 {
-  if (!script_l_arr_.size()) 
+  SCM p = i->get_elt_property ("script-priority");
+  if (!gh_number_p (p))
     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->specs_p_->inside_b(),
-                         s_l->dir_) ].push (s_l);
-    }
-  
-  for (int j =0; j <4; j++) 
-    {
-      placed_l_arr_a[j].sort (Script::compare);
-    }
-
 
-  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]);
-    }
+  Pointer_group_interface gi (me, "scripts");
+  gi.add_element (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];
-       }
-    }
+  me->add_dependency (i);
 }
 
-
-void
-Script_column::add_support (Item*i_l)
+static int
+staff_side_compare (Score_element * const &i1,
+                   Score_element * const &i2)
 {
-  support_l_arr_.push (i_l);
-  add_dependency (i_l);
-  add_element (i_l);
+  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_substitute_element_pointer (Score_element*o,Score_element*n)
+MAKE_SCHEME_CALLBACK(Script_column,before_line_breaking);
+
+SCM
+Script_column::before_line_breaking (SCM smob)
 {
-  if (dynamic_cast <Item *> (o)) 
+  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++)
     {
-      script_l_arr_.substitute (dynamic_cast<Script *> (o),
-                               dynamic_cast <Script *> (n));
-      support_l_arr_.substitute (dynamic_cast <Item *> (o),
-                                dynamic_cast <Item *> (n));
+      arrs[Side_position::get_direction (staff_sided[i])]
+       .push (staff_sided[i]);
     }
+
+  Direction d = DOWN;
+  do {
+    Link_array<Score_element> &arr(arrs[d]);
+    
+    arr.sort (staff_side_compare);
+
+    Score_element * last = 0;
+    for (int i=0; i < arr.size (); i++)
+      {
+
+       if (last)
+         Side_position::add_support( arr[i],last);
+           
+       arr[i]->remove_elt_property ("script-priority");
+       last = arr[i];
+      }
+    
+  } while (flip (&d) != DOWN);
+
+  return SCM_UNSPECIFIED;
 }