X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscript-column.cc;h=deab16f0266f46a6c48f5b58fd3fa1a4824a649d;hb=d182d030b396d66a84efa13d947fbbdfb7240874;hp=720b7f0a11ca268ab7cf505854b81a3f9760a156;hpb=876ccb4004d92f3b7bd539753f8f9339b7d48490;p=lilypond.git

diff --git a/lily/script-column.cc b/lily/script-column.cc
index 720b7f0a11..deab16f026 100644
--- a/lily/script-column.cc
+++ b/lily/script-column.cc
@@ -1,67 +1,87 @@
 /*   
-  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;
+
+  Pointer_group_interface::add_grob (me, ly_symbol2scm ("scripts"),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 (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 ()
-{
-  Drul_array<Link_array<Item> > arrs;
+MAKE_SCHEME_CALLBACK (Script_column,before_line_breaking,1);
 
-  for (int i=0; i < staff_sided_item_l_arr_.size (); i++)
+SCM
+Script_column::before_line_breaking (SCM smob)
+{
+  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++)
     {
-      Staff_sidify st (staff_sided_item_l_arr_[i]);
-      arrs[st.get_direction ()].push (staff_sided_item_l_arr_[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++)
       {
-	Staff_sidify 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]->set_grob_property ("script-priority", SCM_EOL);
 	last = arr[i];
       }
     
   } while (flip (&d) != DOWN);
+
+  return SCM_UNSPECIFIED;
 }
 
+
+ADD_INTERFACE (Script_column,"script-column-interface",
+  "An interface that sorts scripts according to their @code{script-priority}",
+  "");
+
+