Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / lily / self-aligment-interface.cc

diff --git a/lily/self-aligment-interface.cc b/lily/self-aligment-interface.cc
index ed66d30ef1a87ef8482e42b7ea53972453d5e7b4..ff089b6bbdc2e05c9d683d1ddcdd0512b7ac6e9e 100644 (file)
--- a/lily/self-aligment-interface.cc
+++ b/lily/self-aligment-interface.cc
@@ -3,11 +3,12 @@
  
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2004--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "self-alignment-interface.hh"
 #include "warn.hh"
+#include "grob.hh"
 
 MAKE_SCHEME_CALLBACK (Self_alignment_interface, y_aligned_on_self, 1);
 SCM
@@ -34,7 +35,7 @@ Self_alignment_interface::aligned_on_self (Grob *me, Axis a)
     {
       Interval ext (me->extent (me, a));
       if (ext.is_empty ())
-       programming_error ("can't align on self: empty element");
+       programming_error ("cannot align on self: empty element");
       else
        return scm_from_double (- ext.linear_combination (scm_to_double (align)));
     }
@@ -43,12 +44,18 @@ Self_alignment_interface::aligned_on_self (Grob *me, Axis a)
 
 
 
+SCM
+Self_alignment_interface::centered_on_object (Grob *him, Axis a)
+{
+  return scm_from_double (robust_relative_extent (him, him, a).center ());
+}
+
 
 MAKE_SCHEME_CALLBACK (Self_alignment_interface, centered_on_x_parent, 1);
 SCM
 Self_alignment_interface::centered_on_x_parent (SCM smob)
 {
-  return centered_on_parent (unsmob_grob (smob), X_AXIS);
+  return centered_on_object (unsmob_grob (smob)->get_parent (X_AXIS), X_AXIS);
 }
 
 
@@ -56,16 +63,15 @@ MAKE_SCHEME_CALLBACK (Self_alignment_interface, centered_on_y_parent, 1);
 SCM
 Self_alignment_interface::centered_on_y_parent (SCM smob)
 {
-  return centered_on_parent (unsmob_grob (smob), Y_AXIS);
+  return centered_on_object (unsmob_grob (smob)->get_parent (Y_AXIS), Y_AXIS);
 }
 
+
+MAKE_SCHEME_CALLBACK (Self_alignment_interface, x_centered_on_y_parent, 1);
 SCM
-Self_alignment_interface::centered_on_parent (Grob *me, Axis a)
+Self_alignment_interface::x_centered_on_y_parent (SCM smob)
 {
-  Grob *him = me->get_parent (a);
-  Interval he = him->extent (him, a);
-
-  return scm_from_double (he.is_empty () ? 0.0 : he.center ());
+  return centered_on_object (unsmob_grob (smob)->get_parent (Y_AXIS), X_AXIS);
 }
 
 MAKE_SCHEME_CALLBACK (Self_alignment_interface, aligned_on_x_parent,1);
@@ -100,7 +106,7 @@ Self_alignment_interface::aligned_on_parent (Grob *me, Axis a)
 
   Interval ext (me->extent (me, a));
   if (ext.is_empty ())
-    programming_error ("can't align on self: empty element");
+    programming_error ("cannot align on self: empty element");
   else
     x -= ext.linear_combination (align);
 
@@ -110,23 +116,37 @@ Self_alignment_interface::aligned_on_parent (Grob *me, Axis a)
   return scm_from_double (x);
 }
 
-ADD_INTERFACE (Self_alignment_interface, "self-alignment-interface",
+void
+Self_alignment_interface::set_center_parent (Grob *me, Axis a)
+{
+  add_offset_callback (me,
+                      (a==X_AXIS) ? centered_on_x_parent_proc : centered_on_y_parent_proc,
+                      a);
+}
+
+void
+Self_alignment_interface::set_align_self (Grob *me, Axis a)
+{
+  add_offset_callback (me,
+                      (a==X_AXIS) ? x_aligned_on_self_proc : y_aligned_on_self_proc,
+                      a);
+}
+
+ADD_INTERFACE (Self_alignment_interface,
               "Position this object on itself and/or on its parent. To this end, the following functions "
               " are provided: \n"
               "@table @code \n"
-              "@item Self_alignment_interface::aligned_on_self\n"
+              "@item Self_alignment_interface::[xy]_aligned_on_self\n"
               "  Align self on reference point, using @code{self-alignment-X} and "
               "@code{self-alignment-Y}."
-              "@item Self_alignment_interface::aligned_on_parent\n"
-              "@item Self_alignment_interface::centered_on_parent\n"
+              "@item Self_alignment_interface::aligned_on_[xy]_parent\n"
+              "@item Self_alignment_interface::centered_on_[xy]_parent\n"
               "  Shift the object so its own reference point is centered on the  "
               " extent of the parent \n"
-              "@item Self_alignment_interface::centered_on_other_axis_parent\n"
-              " For X-axis, center on the Y-parent, and vice versa.\n "
               "@end table\n",
 
 
-              /* porperties */
+              /* properties */
               "self-alignment-X "
               "self-alignment-Y ");