2003 -> 2004

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

diff --git a/lily/include/align-interface.hh b/lily/include/align-interface.hh
index 04b2cca234d3d1ccdabf7ba5326767e86fcd963f..05fe7e161b0f0de1dc0afe1f0102b6c874aaca14 100644 (file)
--- a/lily/include/align-interface.hh
+++ b/lily/include/align-interface.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -12,42 +12,23 @@
 
 #include "axes.hh"
 #include "lily-proto.hh"
+#include "lily-guile.hh"
+
+struct Align_interface {
+  DECLARE_SCHEME_CALLBACK (alignment_callback, (SCM element, SCM axis));
+  DECLARE_SCHEME_CALLBACK (fixed_distance_alignment_callback, (SCM element, SCM axis));
+  static void align_to_fixed_distance (Grob*,Axis a);
+  static void align_elements_to_extents (Grob*,Axis a);
+  static void set_axis (Grob*,Axis);
+  static Axis axis (Grob*) ;
+  static void add_element (Grob*,Grob*, SCM callback);
+  static int get_count (Grob*,Grob*);
+
+  static bool has_interface (Grob*);
+};
 
-/*
-  TODO: rewrite this comment.
-  
-  
-  Order elements top to bottom/left to right/right to left etc..
-
-  TODO: implement padding.
-
-  document usage of this.
-
-
-
-  *******
-  
-  element properties
+Grob *find_fixed_alignment_parent  (Grob *g);
 
-  stacking-dir
-  
-  Which side to align?  -1: left side, 0: centered (around
-     center_l_ if not nil, or around center of width), 1: right side
- */
-struct Align_interface  {
-  Score_element * elt_l_;
-  
-  Align_interface (Score_element const*);
-  static Real alignment_callback (Score_element *,Axis);
-  void do_side_processing (Axis a);
-  void set_axis (Axis);
-  Axis axis () const;
-  void add_element (Score_element*);
-  int get_count (Score_element*)const;
-  void set_interface ();
-  bool has_interface_b ();
-  static Real center_on_element (Score_element *c, Axis);
-};
 
 #endif /* ALIGN_INTERFACE_HH */