Imported Upstream version 2.16.0

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

diff --git a/lily/tuplet-number.cc b/lily/tuplet-number.cc
index ceff2511674011b0c4c75626a72d7600514f4a71..69e97afef04b6435e1494c28019405d580102c2f 100644 (file)
--- a/lily/tuplet-number.cc
+++ b/lily/tuplet-number.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2005--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -28,17 +28,20 @@
 struct Tuplet_number
 {
   DECLARE_SCHEME_CALLBACK (print, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_x_offset, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_y_offset, (SCM));
   DECLARE_SCHEME_CALLBACK (calc_cross_staff, (SCM));
   DECLARE_GROB_INTERFACE ();
+
+  static Real calc_offset (Spanner *me, Axis a);
 };
-  
 
 MAKE_SCHEME_CALLBACK (Tuplet_number, print, 1);
-SCM 
+SCM
 Tuplet_number::print (SCM smob)
 {
   Spanner *me = unsmob_spanner (smob);
-  Spanner *tuplet = unsmob_spanner (me->get_object ("bracket")); 
+  Spanner *tuplet = unsmob_spanner (me->get_object ("bracket"));
 
   if (!tuplet || !tuplet->is_live ())
     {
@@ -52,20 +55,31 @@ Tuplet_number::print (SCM smob)
   stc->align_to (X_AXIS, CENTER);
   stc->align_to (Y_AXIS, CENTER);
 
-  SCM cpoints =  tuplet->get_property ("control-points");
-  Drul_array<Offset> points;
-  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;
+  return stc->smobbed_copy ();
+}
+
+MAKE_SCHEME_CALLBACK (Tuplet_number, calc_x_offset, 1);
+SCM
+Tuplet_number::calc_x_offset (SCM smob)
+{
+  Spanner *me = unsmob_spanner (smob);
+  Spanner *tuplet = unsmob_spanner (me->get_object ("bracket"));
+
+  Interval x_positions = robust_scm2interval (tuplet->get_property ("X-positions"), Interval (0.0, 0.0));
+
+  return scm_from_double (x_positions.center ());
+}
+
+MAKE_SCHEME_CALLBACK (Tuplet_number, calc_y_offset, 1);
+SCM
+Tuplet_number::calc_y_offset (SCM smob)
+{
+
+  Spanner *me = unsmob_spanner (smob);
+  Spanner *tuplet = unsmob_spanner (me->get_object ("bracket"));
+
+  Drul_array<Real> positions = robust_scm2drul (tuplet->get_property ("positions"), Drul_array<Real> (0.0, 0.0));
+  return scm_from_double ((positions[LEFT] + positions[RIGHT]) / 2.0);
 }
 
 MAKE_SCHEME_CALLBACK (Tuplet_number, calc_cross_staff, 1)
@@ -77,10 +91,11 @@ Tuplet_number::calc_cross_staff (SCM smob)
 }
 
 ADD_INTERFACE (Tuplet_number,
-              "The number for a bracket.",
+               "The number for a bracket.",
 
-              /* properties */
-              "avoid-slur "    // UGH.
-              "bracket "
-              );
+               /* properties */
+               "avoid-slur "    // UGH.
+               "bracket "
+               "direction "
+              );