X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frest.cc;h=da13f6cdbc599cc6ff458380f3890f586fd6010a;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=139386416d4d29387fbd90da7a3534bbb6109995;hpb=2c8c61b3a5cddbb155786a1ca027528701c91ac9;p=lilypond.git

diff --git a/lily/rest.cc b/lily/rest.cc
index 139386416d..da13f6cdbc 100644
--- a/lily/rest.cc
+++ b/lily/rest.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "rest.hh"
@@ -16,6 +16,7 @@
 #include "paper-score.hh"
 #include "staff-symbol-referencer.hh"
 #include "stencil.hh"
+#include "grob.hh"
 
 // -> offset callback
 MAKE_SCHEME_CALLBACK (Rest, y_offset_callback, 1);
@@ -39,24 +40,28 @@ Rest::y_offset_callback (SCM smob)
   else
     amount += ss / 2;
 
-  Grob *dot = unsmob_grob (me->get_object ("dot"));
-  if (dot && duration_log > 4) // UGH.
-    {
-      dot->set_property ("staff-position",
-		       scm_from_int ((duration_log == 7) ? 4 : 3));
-    }
-  if (dot && duration_log >= -1 && duration_log <= 1) // UGH again.
-    {
-      dot->set_property ("staff-position",
-			 scm_from_int ((duration_log == 0) ? -1 : 1));
-    }
-
   if (!position_override)
     amount += 2 * ss * get_grob_direction (me);; 
   
   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++
 */
@@ -186,12 +191,26 @@ Rest::generic_extent_callback (Grob *me, Axis a)
   return ly_interval2scm (unsmob_stencil (m)->extent (a));
 }
 
+MAKE_SCHEME_CALLBACK (Rest, pure_height, 3);
+SCM
+Rest::pure_height (SCM smob, SCM start, SCM end)
+{
+  (void) start;
+  (void) end;
+  
+  Grob *me = unsmob_grob (smob);
+  SCM m = brew_internal_stencil (me, false);
+  return ly_interval2scm (unsmob_stencil (m)->extent (Y_AXIS));
+}
+
 ADD_INTERFACE (Rest,
-	       "A rest symbol.",
+	       "A rest symbol.  The property @code{style} can be"
+	       " @code{default}, @code{mensural}, @code{neomensural} or"
+	       " @code{classical}.",
 
 	       /* properties */
-		  
-	       "style "
 	       "direction "
-	       "minimum-distance");
+	       "minimum-distance "
+	       "style "
+	       );