X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftuplet-number.cc;h=22d857bdd2a2a2fb04f34eef3877de334230d2f1;hb=d4ce4ffb6c483324393e6427a53db24a73bc60e2;hp=31bcbbfa57291a01276ecddc101bc737d5966d7a;hpb=2c8c61b3a5cddbb155786a1ca027528701c91ac9;p=lilypond.git

diff --git a/lily/tuplet-number.cc b/lily/tuplet-number.cc
index 31bcbbfa57..22d857bdd2 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--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
@@ -16,12 +16,13 @@
 
 struct Tuplet_number
 {
-  DECLARE_SCHEME_CALLBACK(print, (SCM));
-  DECLARE_GROB_INTERFACE();
+  DECLARE_SCHEME_CALLBACK (print, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_cross_staff, (SCM));
+  DECLARE_GROB_INTERFACE ();
 };
   
 
-MAKE_SCHEME_CALLBACK(Tuplet_number, print, 1);
+MAKE_SCHEME_CALLBACK (Tuplet_number, print, 1);
 SCM 
 Tuplet_number::print (SCM smob)
 {
@@ -52,14 +53,27 @@ 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. "