X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fself-alignment-interface.hh;h=877998965cafffb0a55908ca96a474a8d2e21b71;hb=7f3f0083f89d87c5ed0422858e9648fc759e98a4;hp=bd1f1096c46208c8ce385775e3b402996f378703;hpb=0ada3837f91b0e14cf7c588351d020b88e50d604;p=lilypond.git diff --git a/lily/include/self-alignment-interface.hh b/lily/include/self-alignment-interface.hh index bd1f1096c4..877998965c 100644 --- a/lily/include/self-alignment-interface.hh +++ b/lily/include/self-alignment-interface.hh @@ -3,20 +3,21 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2005 Han-Wen Nienhuys + (c) 1999--2008 Han-Wen Nienhuys */ #ifndef SELF_ALIGNMENT_INTERFACE_HH #define SELF_ALIGNMENT_INTERFACE_HH -#include "spanner.hh" +#include "lily-proto.hh" +#include "grob-interface.hh" struct Self_alignment_interface { - static bool has_interface (Grob *); + DECLARE_GROB_INTERFACE(); static SCM aligned_on_self (Grob *me, Axis a); - static SCM centered_on_parent (Grob *me, Axis a); + static SCM centered_on_object (Grob *me, Axis a); static SCM aligned_on_parent (Grob *me, Axis a); static void set_center_parent (Grob *me, Axis a); static void set_align_self (Grob *me, Axis a); @@ -26,6 +27,7 @@ struct Self_alignment_interface DECLARE_SCHEME_CALLBACK (centered_on_x_parent, (SCM element)); DECLARE_SCHEME_CALLBACK (centered_on_y_parent, (SCM element)); + DECLARE_SCHEME_CALLBACK (x_centered_on_y_parent, (SCM element)); DECLARE_SCHEME_CALLBACK (aligned_on_x_parent, (SCM element)); DECLARE_SCHEME_CALLBACK (aligned_on_y_parent, (SCM element));