X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faxis-group-interface.cc;h=4319bb8b92cd0594311142bed40928dddeec28ae;hb=f46bf63b68bac25a5384ce5de93d0d92b9651d5f;hp=0020865621caffb88699f2843d5a76ba2df65a57;hpb=a7fe7834a16062ca5f7c55d9af811c2e2a925320;p=lilypond.git

diff --git a/lily/axis-group-interface.cc b/lily/axis-group-interface.cc
index 0020865621..4319bb8b92 100644
--- a/lily/axis-group-interface.cc
+++ b/lily/axis-group-interface.cc
@@ -299,8 +299,8 @@ Axis_group_interface::get_children (Grob *me, vector<Grob*> *found)
 bool
 staff_priority_less (Grob * const &g1, Grob * const &g2)
 {
-  int priority_1 = robust_scm2int (g1->get_property ("outside-staff-priority"), INT_MIN);
-  int priority_2 = robust_scm2int (g2->get_property ("outside-staff-priority"), INT_MIN);
+  Real priority_1 = robust_scm2double (g1->get_property ("outside-staff-priority"), -infinity_f);
+  Real priority_2 = robust_scm2double (g2->get_property ("outside-staff-priority"), -infinity_f);
 
   if (priority_1 < priority_2)
     return true;
@@ -395,7 +395,7 @@ add_grobs_of_one_priority (Skyline_pair *const skylines,
 		  elements[i]->translate_axis (dir*dist, Y_AXIS);
 		}
 	      (*skylines)[dir].insert (b, 0, X_AXIS);
-	      elements[i]->del_property ("outside-staff-padding");
+	      elements[i]->set_property ("outside-staff-priority", SCM_BOOL_F);
 	      last_affected_position[dir] = b[X_AXIS][RIGHT];
 	    }
 	  elements.erase (elements.begin () + i);