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 a9970b393c5585e37a27f2f6229440010d2febdd..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)));
     }
@@ -105,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);
 
@@ -131,7 +132,7 @@ Self_alignment_interface::set_align_self (Grob *me, Axis a)
                       a);
 }
 
-ADD_INTERFACE (Self_alignment_interface, "self-alignment-interface",
+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"
@@ -145,9 +146,7 @@ ADD_INTERFACE (Self_alignment_interface, "self-alignment-interface",
               "@end table\n",
 
 
-              /* porperties */
+              /* properties */
               "self-alignment-X "
-              "self-X-offset "
-              "self-Y-offset "
               "self-alignment-Y ");