X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscript-column.cc;h=3e4092f7c694ad87b6b3c0fa08294e92f05ece3c;hb=98311cc29e8664d281bcc40a808684e7553c8eaa;hp=36ebc6971c85d5219ad8cec8d79cbfb517c658f2;hpb=13a8e28de140702edbb0629002073972008e17ad;p=lilypond.git

diff --git a/lily/script-column.cc b/lily/script-column.cc
index 36ebc6971c..3e4092f7c6 100644
--- a/lily/script-column.cc
+++ b/lily/script-column.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "script-column.hh"
@@ -13,6 +13,7 @@
 #include "directional-element-interface.hh"
 #include "side-position-interface.hh"
 #include "warn.hh"
+#include "grob.hh"
 #include "pointer-group-interface.hh"
 
 #include <map>
@@ -31,7 +32,7 @@ Script_column::add_side_positioned (Grob *me, Grob *script)
 
 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.")
+	   "Compare two grobs by script priority.  For internal use.")
 {
   Grob *i1 = unsmob_grob (a);
   Grob *i2 = unsmob_grob (b);
@@ -132,7 +133,19 @@ Script_column::order_grobs (vector<Grob*> grobs)
 	{
 	  Grob *g = unsmob_grob (scm_car (s));
 	  if (last)
-	    Side_position_interface::add_support (g, last);
+	    {
+	      SCM outside_staff = last->get_property ("outside-staff-priority");
+	      if (scm_is_number (outside_staff))
+		{
+		  /* we allow the outside-staff-priority ordering to override the
+		     script-priority ordering */
+		  if (!scm_is_number (g->get_property ("outside-staff-priority")))
+		    g->set_property ("outside-staff-priority",
+				     scm_from_double (scm_to_double (outside_staff) + 0.1));
+		}
+	      else
+		Side_position_interface::add_support (g, last);
+	    }
 
 	  last = g;
 	}
@@ -140,7 +153,7 @@ Script_column::order_grobs (vector<Grob*> grobs)
   while (flip (&d) != DOWN);
 }
 
-ADD_INTERFACE (Script_column, "script-column-interface",
+ADD_INTERFACE (Script_column,
 	       "An interface that sorts scripts "
 	       "according to their @code{script-priority}",