X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscript-column.cc;h=0676e20f0289978d957ccabb64f798dea6e5343e;hb=0e0aa554eb6f3cd6004904746c54f8f95d6ccebf;hp=f72c1223195100f93eaed7a694557189591f76d8;hpb=df4a7c4a55148e065d878dcc2f7e09ac27ea9c32;p=lilypond.git

diff --git a/lily/script-column.cc b/lily/script-column.cc
index f72c122319..0676e20f02 100644
--- a/lily/script-column.cc
+++ b/lily/script-column.cc
@@ -1,74 +1,92 @@
-/*   
-  script-column.cc --  implement Script_column
-  
+/*
+  script-column.cc -- implement Script_column
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
+
 #include "script-column.hh"
-#include "side-position-interface.hh"
 
-#include "group-interface.hh"
+#include "directional-element-interface.hh"
+#include "side-position-interface.hh"
+#include "warn.hh"
+#include "pointer-group-interface.hh"
 
 void
-Script_column::add_staff_sided (Grob *me, Item *i)
+Script_column::add_staff_sided (Grob *me, Item *item)
 {
-  SCM p = i->get_grob_property ("script-priority");
-  if (!gh_number_p (p))
+  SCM p = item->get_property ("script-priority");
+  if (!scm_is_number (p))
     return;
 
-  Pointer_group_interface::add_element (me, "scripts",i);
-  
-  me->add_dependency (i);
+  Pointer_group_interface::add_grob (me, ly_symbol2scm ("scripts"), item);
 }
 
-static int
-staff_side_compare (Grob * const &i1,
-		    Grob * const &i2)
+LY_DEFINE (ly_grob_script_priority_less, "ly:grob-script-priority-less",
+	   2, 0, 0, (SCM a, SCM b),
+	   "Compare two grobs by script priority. For internal use.")
 {
-  SCM p1 = i1->get_grob_property ("script-priority");
-  SCM p2 = i2->get_grob_property ("script-priority");
+  Grob *i1 = unsmob_grob (a);
+  Grob *i2 = unsmob_grob (b);
 
-  return gh_scm2int (p1) - gh_scm2int (p2);
-}
+  SCM p1 = i1->get_property ("script-priority");
+  SCM p2 = i2->get_property ("script-priority");
 
-MAKE_SCHEME_CALLBACK(Script_column,before_line_breaking,1);
+  return scm_to_int (p1) < scm_to_int (p2) ? SCM_BOOL_T : SCM_BOOL_F;
+}
 
+MAKE_SCHEME_CALLBACK (Script_column, before_line_breaking, 1);
 SCM
 Script_column::before_line_breaking (SCM smob)
 {
-  Grob* me = unsmob_element (smob);
-  Drul_array<Link_array<Grob> > arrs;
-  Link_array<Grob> staff_sided 
-    = Pointer_group_interface__extract_elements (me, (Grob*)0, "scripts");
-				     
-				     
-  for (int i=0; i < staff_sided.size (); i++)
+  Grob *me = unsmob_grob (smob);
+  Drul_array<SCM> scripts_drul (SCM_EOL, SCM_EOL);
+  vector<Grob*> staff_sided;
+
+  extract_grob_set (me, "scripts", scripts);
+  for (vsize i = 0; i < scripts.size (); i++)
     {
-      arrs[Side_position::get_direction (staff_sided[i])]
-	.push (staff_sided[i]);
+      Grob *sc = scripts[i];
+
+      /*
+	Don't want to consider scripts horizontally next to notes.
+      */
+      if (sc->get_property_data (ly_symbol2scm ("X-offset")) !=
+	  Side_position_interface::x_aligned_side_proc)
+	staff_sided.push_back (sc);
+    }
+
+  for (vsize i = 0; i < staff_sided.size (); i++)
+    {
+      Grob *g = staff_sided[i];
+      Direction d = get_grob_direction (g);
+
+      scripts_drul[d] = scm_cons (g->self_scm (), scripts_drul[d]);
     }
 
   Direction d = DOWN;
-  do {
-    Link_array<Grob> &arr(arrs[d]);
-    
-    arr.sort (staff_side_compare);
-
-    Grob * last = 0;
-    for (int i=0; i < arr.size (); i++)
-      {
-
-	if (last)
-	  Side_position::add_support( arr[i],last);
-	    
-	arr[i]->remove_grob_property ("script-priority");
-	last = arr[i];
-      }
-    
-  } while (flip (&d) != DOWN);
+  do
+    {
+      SCM ss = scm_reverse_x (scripts_drul[d], SCM_EOL);
+      ss = scm_stable_sort_x (ss, ly_grob_script_priority_less_proc);
+
+      Grob *last = 0;
+      for (SCM s = ss; scm_is_pair (s); s = scm_cdr (s))
+	{
+	  Grob *g = unsmob_grob (scm_car (s));
+	  if (last)
+	    Side_position_interface::add_support (g, last);
+
+	  last = g;
+	}
+    }
+  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}",
+	       "");