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

diff --git a/lily/script-column.cc b/lily/script-column.cc
index 720b7f0a11..917122c9e6 100644
--- a/lily/script-column.cc
+++ b/lily/script-column.cc
@@ -1,67 +1,97 @@
 /*   
-  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--2004 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_property ("script-priority");
+  if (!scm_is_number (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)
+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_elt_property ("script-priority");
-  SCM p2 = i2->get_elt_property ("script-priority");
+  Grob *i1 = unsmob_grob (a);
+  Grob *i2 = unsmob_grob (b);
+
+  SCM p1 = i1->get_property ("script-priority");
+  SCM p2 = i2->get_property ("script-priority");
 
-  return gh_scm2int (p1) - gh_scm2int (p2);
+  return scm_to_int (p1) < scm_to_int (p2) ? SCM_BOOL_T : SCM_BOOL_F;
 }
 
-void
-Script_column::do_pre_processing ()
+MAKE_SCHEME_CALLBACK (Script_column, before_line_breaking, 1);
+SCM
+Script_column::before_line_breaking (SCM smob)
 {
-  Drul_array<Link_array<Item> > arrs;
+  Grob* me = unsmob_grob (smob);
+  Drul_array<SCM> scripts (SCM_EOL, SCM_EOL);
+  Link_array<Grob> staff_sided;
+  
+  for (SCM s = me->get_property ("scripts"); scm_is_pair (s); s = scm_cdr (s))
+    {
+      Grob *sc = unsmob_grob (scm_car (s));
 
-  for (int i=0; i < staff_sided_item_l_arr_.size (); i++)
+      /*
+	Don't want to consider scripts horizontally next to notes.
+       */
+      if (!sc->has_offset_callback (Side_position_interface::aligned_side_proc,
+				    X_AXIS))
+	staff_sided.push (sc);
+    }
+  
+  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]);
+      Grob* g = staff_sided[i];
+      Direction d = Side_position_interface::get_direction (g);
+      if (!d)
+	{
+	  programming_error ( "No direction for script?");
+	  d = DOWN;
+	  g->set_property ("direction", scm_int2num (d));
+	}
+      
+      scripts[d] = scm_cons (g->self_scm (), scripts[d]);
     }
 
   Direction d = DOWN;
-  do {
-    Link_array<Item> &arr(arrs[d]);
-    
-    arr.sort (staff_side_compare);
+  do
+    {
+      SCM ss = scm_reverse_x (scripts[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);
 
-    Item * last = 0;
-    for (int i=0; i < arr.size (); i++)
-      {
-	Staff_sidify s (arr[i]);
-	if (last)
-	  {
-	    s.add_support (last);
-	  }
-	    
-	arr[i]->remove_elt_property ("script-priority");
-	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}",
+	       "");