X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob.cc;h=495fe2437f97cbddabfb90712d08afbc9c6f3928;hb=e93ef6da649651c20932fa4acbe807e8cb37e0ac;hp=bc948659f12b1a93e233c831ae55101660707862;hpb=c3805257667c04b22ba780ad9b3f4a37788cf6bd;p=lilypond.git

diff --git a/lily/grob.cc b/lily/grob.cc
index bc948659f1..495fe2437f 100644
--- a/lily/grob.cc
+++ b/lily/grob.cc
@@ -128,7 +128,7 @@ Grob::get_print_stencil () const
 	  Real x = scm_to_double (scm_cadr (rot));
 	  Real y = scm_to_double (scm_caddr (rot));
 
-	  retval.rotate (angle, Offset (x, y));
+	  retval.rotate_degrees (angle, Offset (x, y));
 	}
 
       /* color support... see interpret_stencil_expression () for more... */
@@ -394,7 +394,7 @@ Grob::extent (Grob *refp, Axis a) const
 	(a == X_AXIS)
 	? ly_symbol2scm ("X-extent")
 	: ly_symbol2scm ("Y-extent");
-
+	
       SCM ext = internal_get_property (ext_sym);
       if (is_number_pair (ext))
 	real_ext.unite (ly_scm2interval (ext));
@@ -446,7 +446,7 @@ Grob::maybe_pure_extent (Grob *refp, Axis a, bool pure, int start, int end)
 }
 
 Interval_t<int>
-Grob::spanned_rank_iv () const
+Grob::spanned_rank_interval () const
 {
   return Interval_t<int> (-1, 0);
 }
@@ -613,6 +613,7 @@ ADD_INTERFACE (Grob,
 	       "before-line-breaking "
 	       "cause "
 	       "color "
+	       "cross-staff "
 	       "extra-X-extent "
 	       "extra-Y-extent "
 	       "extra-offset "
@@ -654,7 +655,7 @@ Grob::stencil_height (SCM smob)
   return grob_stencil_extent (me, Y_AXIS);
 }
 
-MAKE_SCHEME_CALLBACK(Grob, y_parent_positioning, 1);
+MAKE_SCHEME_CALLBACK (Grob, y_parent_positioning, 1);
 SCM
 Grob::y_parent_positioning (SCM smob)
 {
@@ -667,7 +668,7 @@ Grob::y_parent_positioning (SCM smob)
 }
 
 
-MAKE_SCHEME_CALLBACK(Grob, x_parent_positioning, 1);
+MAKE_SCHEME_CALLBACK (Grob, x_parent_positioning, 1);
 SCM
 Grob::x_parent_positioning (SCM smob)
 {