X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fself-alignment-interface.hh;h=2b34b39eff78b1dd47b09d10b66c54c8555e86bc;hb=c39d188d28fdc84cef8cbaea7b8d6e2fb718c30f;hp=985ce91fee9bf0d6799e2efd44a1fb7753cc5c97;hpb=f35d4a9029092ff950da509fd77335e7c61779da;p=lilypond.git

diff --git a/lily/include/self-alignment-interface.hh b/lily/include/self-alignment-interface.hh
index 985ce91fee..2b34b39eff 100644
--- a/lily/include/self-alignment-interface.hh
+++ b/lily/include/self-alignment-interface.hh
@@ -1,22 +1,48 @@
-/*   
-  side-position-interface.hh -- declare Side_position_interface
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 1999--2014 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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #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_SCHEME_CALLBACK (aligned_on_self, (SCM element, SCM axis));
-  DECLARE_SCHEME_CALLBACK (centered_on_parent, (SCM element, SCM axis));
-  DECLARE_SCHEME_CALLBACK (centered_on_other_axis_parent, (SCM element, SCM axis));
+  DECLARE_GROB_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 void set_center_parent (Grob *me, Axis a);
+  static void set_align_self (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 (aligned_on_x_parent, (SCM element));
+  DECLARE_SCHEME_CALLBACK (aligned_on_y_parent, (SCM element));
 };
 #endif