X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fside-position-interface.hh;h=edb6dc6a7a09ce72e75d37e1a5a5dfa6a2c58890;hb=efbdfc972f673abbd19fa6b177edb3398ccf804f;hp=d5392ee73df095e0a44b10adeb20f6f2145ddfb1;hpb=d8ddee6490dd1bb4965980d3e952a390493bfffd;p=lilypond.git

diff --git a/lily/include/side-position-interface.hh b/lily/include/side-position-interface.hh
index d5392ee73d..edb6dc6a7a 100644
--- a/lily/include/side-position-interface.hh
+++ b/lily/include/side-position-interface.hh
@@ -1,43 +1,57 @@
-/*   
-  side-position-interface.hh -- declare Side_position_interface
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 1999--2012 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.
+  TODO: move out unrelated callbacks.
 
   TODO: reduce number of methods.
 */
-struct Side_position
+struct Side_position_interface
 {
 public:
-  DECLARE_SCHEME_CALLBACK(side_position, (SCM  element, SCM axis));
-  DECLARE_SCHEME_CALLBACK(aligned_on_self, (SCM  element, SCM axis));
-  DECLARE_SCHEME_CALLBACK(aligned_side, (SCM element, SCM axis));  
-  DECLARE_SCHEME_CALLBACK(quantised_position, (SCM element, SCM axis));
-  DECLARE_SCHEME_CALLBACK(centered_on_parent, (SCM element, SCM axis));
-  static void set_axis (Score_element*,Axis);
-  static void set_minimum_space (Score_element*,Real);
-  static void set_padding (Score_element*,Real);
-  static Axis get_axis (Score_element*) ;
-  static bool supported_b (Score_element*) ;
-  static bool has_interface (Score_element*) ;
-  static void add_support (Score_element*,Score_element*);
-  static void add_staff_support (Score_element*);
-  static Direction get_direction (Score_element*);
-  static void set_direction (Score_element*,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 SCM general_side_position (Grob *, Axis, bool, bool my_extents,
+                                    bool pure, int start, int end, Real *current_off);
+  static SCM skyline_side_position (Grob *me, Axis a, bool pure, int start, int end, Real *current_offset);
+
+  static Axis get_axis (Grob *);
+  static void set_axis (Grob *, Axis);
+  DECLARE_GROB_INTERFACE ();
+  static void add_support (Grob *, Grob *);
+  static void add_staff_support (Grob *);
+};
 
 #endif /* SIDE_POSITION_INTERFACE_HH */