X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftuplet-number.cc;h=a08c37dd3e1d0a96b3485cda7102a8a4bf5b6e59;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=aa0c343c589977f251100dd641ff7bb8df380b43;hpb=3f8485925e8c879fe4c9ae86acef9804126c3b91;p=lilypond.git

diff --git a/lily/tuplet-number.cc b/lily/tuplet-number.cc
index aa0c343c58..a08c37dd3e 100644
--- a/lily/tuplet-number.cc
+++ b/lily/tuplet-number.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
@@ -17,6 +17,7 @@
 struct Tuplet_number
 {
   DECLARE_SCHEME_CALLBACK (print, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_cross_staff, (SCM));
   DECLARE_GROB_INTERFACE ();
 };
   
@@ -34,16 +35,6 @@ Tuplet_number::print (SCM smob)
       return SCM_EOL;
     }
 
-  /*
-    Don't print if it doesn't span time.
-   */
-  if (robust_scm2moment (tuplet->get_bound (LEFT)->get_column ()->get_property ("when"), Moment (0))
-      == robust_scm2moment (tuplet->get_bound (RIGHT)->get_column ()->get_property ("when"), Moment (0)))
-    {
-      me->suicide ();
-      return SCM_EOL;
-    }
-
   SCM stc_scm = Text_interface::print (smob);
   Stencil *stc = unsmob_stencil (stc_scm);
 
@@ -52,20 +43,33 @@ Tuplet_number::print (SCM smob)
 
   SCM cpoints =  tuplet->get_property ("control-points");
   Drul_array<Offset> points;
-  points[LEFT] = ly_scm2offset (scm_car (cpoints));
-  points[RIGHT] = ly_scm2offset (scm_cadr (cpoints));
-
+  if (scm_is_pair (cpoints))
+    {
+      points[LEFT] = ly_scm2offset (scm_car (cpoints));
+      points[RIGHT] = ly_scm2offset (scm_cadr (cpoints));
+    }
+  else
+    {
+      programming_error ("wrong type for control-points");
+    }
   stc->translate ((points[RIGHT] + points[LEFT]) / 2);
   
   return stc_scm;
 }
 
+MAKE_SCHEME_CALLBACK (Tuplet_number, calc_cross_staff, 1)
+SCM
+Tuplet_number::calc_cross_staff (SCM smob)
+{
+  Grob *me = unsmob_grob (smob);
+  return unsmob_grob (me->get_object ("bracket"))->get_property ("cross-staff");
+}
 
 ADD_INTERFACE (Tuplet_number,
-	       "The number for a bracket. "
-	       ,
+	       "The number for a bracket.",
 
 	       /* properties */
 	       "avoid-slur " 	// UGH.
-	       "bracket ");
+	       "bracket "
+	       );