Merge with master

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

diff --git a/lily/self-aligment-interface.cc b/lily/self-aligment-interface.cc
index 175a02254733215279547cecf7b533661bc25ba0..b990ff01c0271b4f4688837daf95cd39f12cd4d4 100644 (file)
--- a/lily/self-aligment-interface.cc
+++ b/lily/self-aligment-interface.cc
@@ -3,11 +3,13 @@
  
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2007 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);
@@ -35,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 (cannot 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)));
     }
@@ -92,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")
@@ -106,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 (cannot align on self: empty element");
+    programming_error ("cannot align on self: empty element");
   else
     x -= ext.linear_combination (align);