X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscript-column.cc;h=1ae7969b4e3f84afface3e4bbe53f4057f78ad34;hb=a995cb68588f9d47868ca6d9ffb3799b3a9d09a2;hp=a50f794961dce2c3a5ae98400c646fafe4bd890c;hpb=0da65512d3ef498ace08623f449b4af08411a89c;p=lilypond.git

diff --git a/lily/script-column.cc b/lily/script-column.cc
index a50f794961..1ae7969b4e 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>
@@ -64,7 +65,7 @@ Script_column::row_before_line_breaking (SCM smob)
 	{
 	  affect_all_grobs.push_back (sc);
 	}
-      else if (sc->get_property_data (ly_symbol2scm ("Y-offset")) !=
+      else if (sc->get_property_data ("Y-offset") !=
 	       Side_position_interface::x_aligned_side_proc)
 	{
 	  head_scripts_map[sc->get_parent (Y_AXIS)].push_back (sc);
@@ -100,7 +101,7 @@ Script_column::before_line_breaking (SCM smob)
       /*
 	Don't want to consider scripts horizontally next to notes.
       */
-      if (sc->get_property_data (ly_symbol2scm ("X-offset")) !=
+      if (sc->get_property_data ("X-offset") !=
 	  Side_position_interface::x_aligned_side_proc)
 	staff_sided.push_back (sc);
     }
@@ -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}",