Fix 1062.

[lilypond.git] / lily / tuplet-number.cc

diff --git a/lily/tuplet-number.cc b/lily/tuplet-number.cc
index 54032803e9d0f216f402ec01404a113de04c2488..7e1993ecb4bafbd2add1425799d5e83d69a1ee5c 100644 (file)
--- a/lily/tuplet-number.cc
+++ b/lily/tuplet-number.cc
@@ -1,10 +1,21 @@
 /*
-  tuplet-number.cc -- implement Tuplet_number
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2005--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "tuplet-bracket.hh"
@@ -17,6 +28,7 @@
 struct Tuplet_number
 {
   DECLARE_SCHEME_CALLBACK (print, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_cross_staff, (SCM));
   DECLARE_GROB_INTERFACE ();
 };
   
@@ -34,16 +46,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);
 
@@ -66,12 +68,19 @@ Tuplet_number::print (SCM smob)
   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 "
+              );