X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fself-aligment-interface.cc;h=71d2e1f96da987fccef3bbe4d43943ad503cad8b;hb=f01d48144dd62b47a76506e8a8bf1bb81d1d1130;hp=dc2c20a32e51e238ad1cfc6c82bdf7e68a46185f;hpb=75eebcb49e52d296b1da3e1074e0825d2c780db4;p=lilypond.git

diff --git a/lily/self-aligment-interface.cc b/lily/self-aligment-interface.cc
index dc2c20a32e..71d2e1f96d 100644
--- a/lily/self-aligment-interface.cc
+++ b/lily/self-aligment-interface.cc
@@ -3,11 +3,14 @@
  
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "self-alignment-interface.hh"
+
 #include "warn.hh"
+#include "paper-column.hh"
+#include "grob.hh"
 
 MAKE_SCHEME_CALLBACK (Self_alignment_interface, y_aligned_on_self, 1);
 SCM
@@ -34,7 +37,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)));
     }
@@ -91,6 +94,9 @@ SCM
 Self_alignment_interface::aligned_on_parent (Grob *me, Axis a)
 {
   Grob *him = me->get_parent (a);
+  if (Paper_column::has_interface (him))
+    return scm_from_double (0.0);
+    
   Interval he = him->extent (him, a);
 
   SCM sym = (a == X_AXIS) ? ly_symbol2scm ("self-alignment-X")
@@ -105,7 +111,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);
 
@@ -131,21 +137,22 @@ Self_alignment_interface::set_align_self (Grob *me, Axis a)
 		       a);
 }
 
-ADD_INTERFACE (Self_alignment_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"
+ADD_INTERFACE (Self_alignment_interface,
+	       "Position this object on itself and/or on its parent.  To this"
+	       " end, the following functions are provided:\n"
+	       "\n"
+	       "@table @code\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}."
+	       "Align self on reference point, using"
+	       " @code{self-alignment-X} and @code{self-alignment-Y}."
 	       "@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"
+	       "Shift the object so its own reference point is centered on"
+	       " the extent of the parent\n"
 	       "@end table\n",
 
-
-	       /* porperties */
+	       /* properties */
 	       "self-alignment-X "
-	       "self-alignment-Y ");
+	       "self-alignment-Y "
+	       );