Merge branch 'lilypond/translation' of ssh://git.sv.gnu.org/srv/git/lilypond into...

[lilypond.git] / lily / include / align-interface.hh

diff --git a/lily/include/align-interface.hh b/lily/include/align-interface.hh
index f570a60509603c28bf7a2e2f42ff61ba34089fdb..467f1248f260cfa2b8d30b0ee82223674460a102 100644 (file)
--- a/lily/include/align-interface.hh
+++ b/lily/include/align-interface.hh
@@ -1,63 +1,35 @@
 /*
   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--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #ifndef ALIGN_INTERFACE_HH
 #define ALIGN_INTERFACE_HH
 
-#include "axes.hh"
 #include "lily-proto.hh"
-
-/*
-  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)
-
-  group-center-element -- element which will be at the center of the group
-    after aligning (when using Align_interface::center_on_element)
-
-  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 Real alignment_callback (Score_element *,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 Real center_on_element (Score_element *c, Axis);
+#include "std-vector.hh"
+#include "grob-interface.hh"
+
+struct Align_interface
+{
+  DECLARE_SCHEME_CALLBACK (align_to_minimum_distances, (SCM));
+  DECLARE_SCHEME_CALLBACK (align_to_ideal_distances, (SCM));
+  static void align_elements_to_minimum_distances(Grob *, Axis a);
+  static void align_elements_to_ideal_distances(Grob *);
+  static vector<Real> get_minimum_translations (Grob *, vector<Grob*> const&,
+                                               Axis a,
+                                               bool safe, int start, int end);
+  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 */