X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fside-position-interface.hh;h=c0330e795d1497bf5c4ecbb1b24bdcf25a7751c6;hb=28d3a736534f3aa3cd403485770a019bd35114c4;hp=7bcb13aa395862d05e130f591760d89abdf8aa6f;hpb=0af2486a28f1c60b9de929a9101964d880927e54;p=lilypond.git

diff --git a/lily/include/side-position-interface.hh b/lily/include/side-position-interface.hh
index 7bcb13aa39..c0330e795d 100644
--- a/lily/include/side-position-interface.hh
+++ b/lily/include/side-position-interface.hh
@@ -1,61 +1,51 @@
-/*   
-  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.
 
-#ifndef SIDE_POSITION_INTERFACE_HH
-#define SIDE_POSITION_INTERFACE_HH
-
-#include "spanner.hh"
-#include "item.hh"
+  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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
-/**
-   Position victim object (ELT_L_) next to other objects (the support).
+  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.
 
-   side-support -- list of score elements
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
-   direction -- where to put the victim object (left or right?)
+#ifndef SIDE_POSITION_INTERFACE_HH
+#define SIDE_POSITION_INTERFACE_HH
 
-   side-relative-direction -- if set: get the direction from a different object, and multiply by this.
-   
-   direction-source -- in case side-relative-direction is set, where
-   to get the direction
+#include "grob-interface.hh"
+#include "lily-proto.hh"
 
-   minimum-space -- minimum distance that the victim should move
-   (after padding)
+/*
+  TODO: move out unrelated callbacks.
 
-   padding -- add this much extra space between victim and support
+  TODO: reduce number of methods.
+*/
+struct Side_position_interface
+{
+public:
 
+  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));
 
-   TODO: move  out unrelated callbacks.
+  static SCM aligned_side (Grob *me, Axis a, bool pure, int start, int end, Real *current_off_ptr);
 
-   TODO: reduce number of methods.
- */
-struct Side_position
-{
-public:
-  static Real side_position (Score_element *, Axis);
-  static Real aligned_on_self (Score_element *, Axis);
-  static Real aligned_side (Score_element *, Axis);  
-  static Real quantised_position (Score_element *, Axis);
-  static Real centered_on_parent (Score_element *, 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);
+  static Axis get_axis (Grob *);
+  static void set_axis (Grob *, Axis);
+  static void add_support (Grob *, Grob *);
+  static void recursive_add_support (Grob *, Grob *);
+  static void add_staff_support (Grob *);
 };
 
-
 #endif /* SIDE_POSITION_INTERFACE_HH */