X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fside-position-interface.hh;h=46f592fb8d89bb9d389cc861a9981411674bf925;hb=e7aa6c445f463844dbaa52d38ea4aac2882b5601;hp=9e107eb9d4246b75037894ec5bbf07745ddba16b;hpb=a0a40c02de757661518577105dbb644a6ecdbc4d;p=lilypond.git

diff --git a/lily/include/side-position-interface.hh b/lily/include/side-position-interface.hh
index 9e107eb9d4..46f592fb8d 100644
--- a/lily/include/side-position-interface.hh
+++ b/lily/include/side-position-interface.hh
@@ -1,17 +1,27 @@
-/*   
-  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 SIDE_POSITION_INTERFACE_HH
 #define SIDE_POSITION_INTERFACE_HH
 
-#include "spanner.hh"
-#include "item.hh"
+#include "grob-interface.hh"
+#include "lily-proto.hh"
 
 /*
   TODO: move out unrelated callbacks.
@@ -21,29 +31,24 @@
 struct Side_position_interface
 {
 public:
-  DECLARE_SCHEME_CALLBACK (aligned_on_support_extents, (SCM element, SCM axis));
-  DECLARE_SCHEME_CALLBACK (aligned_on_support_refpoints, (SCM element, SCM axis));
-  
-  DECLARE_SCHEME_CALLBACK (aligned_side, (SCM element, SCM axis));  
-
-  DECLARE_SCHEME_CALLBACK (out_of_staff, (SCM element, SCM axis));  
-
-  DECLARE_SCHEME_CALLBACK (quantised_position, (SCM element, SCM axis));
-
-  static SCM general_side_position (Grob*, Axis, bool);
-  static void set_axis (Grob*,Axis);
-  static void set_minimum_space (Grob*,Real);
-  static void set_padding (Grob*,Real);
-  static Axis get_axis (Grob*) ;
-  static bool supported_b (Grob*) ;
-  static bool has_interface (Grob*) ;
-  static void add_support (Grob*,Grob*);
-  static void add_staff_support (Grob*);
-  static Direction get_direction (Grob*);
-  static void set_direction (Grob*,Direction);
-};
-
 
+  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 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 *);
+};
 
 #endif /* SIDE_POSITION_INTERFACE_HH */