X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Falign-interface.hh;h=8cec05324bbcdebc4e2013b973a231700d08c893;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=35070547be7974bf605add6591c4434c05648d52;hpb=e0833e924a7b626154c66170d98335c6c4985dfe;p=lilypond.git

diff --git a/lily/include/align-interface.hh b/lily/include/align-interface.hh
index 35070547be..8cec05324b 100644
--- a/lily/include/align-interface.hh
+++ b/lily/include/align-interface.hh
@@ -1,67 +1,37 @@
 /*
   align-interface.hh -- declare Align_interface
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 2000--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #ifndef ALIGN_INTERFACE_HH
 #define ALIGN_INTERFACE_HH
 
-#include "axes.hh"
 #include "lily-proto.hh"
-#include "lily-guile.hh"
-
-extern SCM Align_interface_alignment_callback_proc;
-/*
-  Order elements top to bottom/left to right/right to left etc.
-
-
-  *******
-  
-  element properties
-
-  stacking-dir -- stack contents of elements in which direction ?
-
-  align-dir -- Which side to align? -1: left side, 0: centered (around
-    center_l_ if not nil, or around center of width), 1: right side
-
-  threshold -- (cons MIN MAX), where MIN and MAX are dimensions in
-    staffspace
-
-  alignment-done -- boolean to administrate whether we've done the alignment already (to ensure that the process is done only once)
-
-  center-element -- element which will be at the center of the group
-    after aligning (when using
-    Align_interface::center_on_element). The center element should
-    have this object as a reference point.
-
-  elements -- to be aligned elements 
-
-  axes -- list of axis numbers. Should contain only one number.
-  
-  *******
-  
-  Reads the following from its elements
-  
-  
-  minimum-space --  (cons LEFT RIGHT)
-
-  extra-space -- (cons LEFT RIGHT)
-  
-*/
-struct Align_interface {
-  static SCM alignment_callback (SCM element, SCM axis);
-  static void do_side_processing (Score_element*,Axis a);
-  static void set_axis (Score_element*,Axis);
-  static Axis axis (Score_element*) ;
-  static void add_element (Score_element*,Score_element*);
-  static int get_count (Score_element*,Score_element*);
-  static void set_interface (Score_element*);
-  static bool has_interface (Score_element*);
-  static SCM center_on_element (SCM element, SCM axis);
+#include "std-vector.hh"
+#include "grob-interface.hh"
+
+struct Align_interface
+{
+  DECLARE_SCHEME_CALLBACK (calc_positioning_done, (SCM));
+  DECLARE_SCHEME_CALLBACK (stretch_after_break, (SCM element));
+  DECLARE_SCHEME_CALLBACK (calc_max_stretch, (SCM));
+  static void stretch (Grob *, Real amount, Axis a);
+  static void align_elements_to_extents (Grob *, Axis a);
+  static vector<Real> get_extents_aligned_translates (Grob *, vector<Grob*> const&,
+						      Axis a,
+						      bool safe, int start, int end);
+  static int stretchable_children_count (Grob const*);
+  static void set_ordered (Grob *);
+  static Axis axis (Grob *);
+  static void add_element (Grob *, Grob *);
+  static int get_count (Grob *, Grob *);
+
+  DECLARE_GROB_INTERFACE();
+
+  static Real get_pure_child_y_translation (Grob *, Grob *child, int start, int end);
 };
 
 #endif /* ALIGN_INTERFACE_HH */