offsets <-> scm conversion routines

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

diff --git a/lily/tuplet-number.cc b/lily/tuplet-number.cc
index d04e8f3aadfd4d1f934a5846e142dd483f6d8330..31bcbbfa57291a01276ecddc101bc737d5966d7a 100644 (file)
--- a/lily/tuplet-number.cc
+++ b/lily/tuplet-number.cc
@@ -8,6 +8,8 @@
 */
 
 #include "tuplet-bracket.hh"
+#include "moment.hh"
+#include "paper-column.hh"
 #include "text-interface.hh"
 #include "spanner.hh"
 #include "lookup.hh"
@@ -15,7 +17,7 @@
 struct Tuplet_number
 {
   DECLARE_SCHEME_CALLBACK(print, (SCM));
-  static bool has_interface (Grob *);
+  DECLARE_GROB_INTERFACE();
 };
   
 
@@ -23,13 +25,31 @@ MAKE_SCHEME_CALLBACK(Tuplet_number, print, 1);
 SCM 
 Tuplet_number::print (SCM smob)
 {
-  Stencil *stc = unsmob_stencil (Text_interface::print (smob));
+  Spanner *me = unsmob_spanner (smob);
+  Spanner *tuplet = unsmob_spanner (me->get_object ("bracket")); 
+
+  if (!tuplet || !tuplet->is_live ())
+    {
+      me->suicide ();
+      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);
 
   stc->align_to (X_AXIS, CENTER);
   stc->align_to (Y_AXIS, CENTER);
 
-  Spanner *me = unsmob_spanner (smob);
-  Spanner *tuplet = unsmob_spanner (me->get_object ("bracket")); 
   SCM cpoints =  tuplet->get_property ("control-points");
   Drul_array<Offset> points;
   points[LEFT] = ly_scm2offset (scm_car (cpoints));
@@ -37,12 +57,11 @@ Tuplet_number::print (SCM smob)
 
   stc->translate ((points[RIGHT] + points[LEFT]) / 2);
   
-  return stc->smobbed_copy ();
+  return stc_scm;
 }
 
 
 ADD_INTERFACE (Tuplet_number,
-              "tuplet-number-interface",
               "The number for a bracket. "
               ,