X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fself-alignment-interface.hh;h=ffdfb825015366b1aef10403b5157360856f9ef6;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=1a5099d2a2475ca3d5bbd69a0b6815ab00139b14;hpb=47236e0a7a5a75d5dd2be521c44102b20d8c76ce;p=lilypond.git

diff --git a/lily/include/self-alignment-interface.hh b/lily/include/self-alignment-interface.hh
index 1a5099d2a2..ffdfb82501 100644
--- a/lily/include/self-alignment-interface.hh
+++ b/lily/include/self-alignment-interface.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1999--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1999--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -30,22 +30,15 @@ struct Self_alignment_interface
   static SCM aligned_on_self (Grob *me, Axis a, bool pure, int start, int end);
   static SCM centered_on_object (Grob *me, Axis a);
   static SCM aligned_on_parent (Grob *me, Axis a);
-  static SCM avoid_colliding_grobs (Grob *me, Axis a, Real offset);
-  static void set_center_parent (Grob *me, Axis a);
-  static void set_align_self (Grob *me, Axis a);
-  static void avoid_x_collisions (Grob *me);
+  static void set_aligned_on_parent (Grob *me, Axis a);
 
   DECLARE_SCHEME_CALLBACK (x_aligned_on_self, (SCM element));
   DECLARE_SCHEME_CALLBACK (y_aligned_on_self, (SCM element));
 
   DECLARE_SCHEME_CALLBACK (pure_y_aligned_on_self, (SCM element, SCM start, SCM end));
 
-  DECLARE_SCHEME_CALLBACK (centered_on_note_columns, (SCM element));
   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 (avoid_x_colliding_grobs, (SCM element, SCM offset));
-  DECLARE_SCHEME_CALLBACK (x_colliding_grobs, (SCM element));
   DECLARE_SCHEME_CALLBACK (aligned_on_x_parent, (SCM element));
   DECLARE_SCHEME_CALLBACK (aligned_on_y_parent, (SCM element));
 };