X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Frest.cc;h=da13f6cdbc599cc6ff458380f3890f586fd6010a;hb=57c350f45c7c18577bf81433373c5483e86ca54c;hp=1f756c4c916798674cb700a0965b5a27848f1475;hpb=6fb6249345ce846c8c55f843b21c6e85024a720b;p=lilypond.git

diff --git a/lily/rest.cc b/lily/rest.cc
index 1f756c4c91..da13f6cdbc 100644
--- a/lily/rest.cc
+++ b/lily/rest.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "rest.hh"
@@ -46,6 +46,22 @@ Rest::y_offset_callback (SCM smob)
   return scm_from_double (amount);
 }
 
+/* A rest might lie under a beam, in which case it should be cross-staff if
+   the beam is cross-staff because the rest's position depends on the
+   formatting of the beam. */
+MAKE_SCHEME_CALLBACK (Rest, calc_cross_staff, 1);
+SCM
+Rest::calc_cross_staff (SCM smob)
+{
+  Grob *me = unsmob_grob (smob);
+  Grob *stem = unsmob_grob (me->get_object ("stem"));
+
+  if (!stem)
+    return SCM_BOOL_F;
+
+  return stem->get_property ("cross-staff");
+}
+
 /*
   make this function easily usable in C++
 */
@@ -188,9 +204,9 @@ Rest::pure_height (SCM smob, SCM start, SCM end)
 }
 
 ADD_INTERFACE (Rest,
-	       "A rest symbol.  The property @code{style} can be "
-	       "@code{default}, @code{mensural}, @code{neomensural} or "
-	       "@code{classical}.",
+	       "A rest symbol.  The property @code{style} can be"
+	       " @code{default}, @code{mensural}, @code{neomensural} or"
+	       " @code{classical}.",
 
 	       /* properties */
 	       "direction "