X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fside-position-interface.hh;h=c0330e795d1497bf5c4ecbb1b24bdcf25a7751c6;hb=cee6cea4ed55eb4fa1f9d83c997ebc19744a6e1a;hp=a19e27884773f7b6dcea22ec974373730a55fcdf;hpb=e344ae579fa1d81fc6c6f3049494697872fd39f9;p=lilypond.git

diff --git a/lily/include/side-position-interface.hh b/lily/include/side-position-interface.hh
index a19e278847..c0330e795d 100644
--- a/lily/include/side-position-interface.hh
+++ b/lily/include/side-position-interface.hh
@@ -1,9 +1,20 @@
 /*
-  side-position-interface.hh -- declare Side_position_interface
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1999--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1999--2008 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 SIDE_POSITION_INTERFACE_HH
@@ -21,23 +32,19 @@ struct Side_position_interface
 {
 public:
 
-  DECLARE_SCHEME_CALLBACK (y_aligned_on_support_refpoints, (SCM element));
-  DECLARE_SCHEME_CALLBACK (pure_y_aligned_on_support_refpoints, (SCM element, SCM start, SCM end));
   DECLARE_SCHEME_CALLBACK (x_aligned_side, (SCM element, SCM current));
   DECLARE_SCHEME_CALLBACK (y_aligned_side, (SCM element, SCM current));
   DECLARE_SCHEME_CALLBACK (pure_y_aligned_side, (SCM element, SCM start, SCM end, SCM current));
   DECLARE_SCHEME_CALLBACK (calc_cross_staff, (SCM element));
+  DECLARE_SCHEME_CALLBACK (move_to_extremal_staff, (SCM));
 
-  static SCM aligned_side (Grob*me, Axis a, bool pure, int start, int end, Real *current_off_ptr);
+  static SCM aligned_side (Grob *me, Axis a, bool pure, int start, int end, Real *current_off_ptr);
 
-  static SCM general_side_position (Grob *, Axis, bool, bool my_extents,
-				    bool pure, int start, int end, Real *current_off);
   static Axis get_axis (Grob *);
   static void set_axis (Grob *, Axis);
-  DECLARE_GROB_INTERFACE();
   static void add_support (Grob *, Grob *);
+  static void recursive_add_support (Grob *, Grob *);
   static void add_staff_support (Grob *);
-  static Direction get_direction (Grob *);
 };
 
 #endif /* SIDE_POSITION_INTERFACE_HH */