X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Falign-interface.hh;h=612c31c0d5bef18fc53c35575bcec351180b4c27;hb=d9b67cc332fa253ab0679b54873b2f17fc37e099;hp=904f20202a5b976ccde71767dc522c7d80b9a000;hpb=8ecd09ad7514d57630fb611d38c161f3c3c708db;p=lilypond.git

diff --git a/lily/include/align-interface.hh b/lily/include/align-interface.hh
index 904f20202a..612c31c0d5 100644
--- a/lily/include/align-interface.hh
+++ b/lily/include/align-interface.hh
@@ -1,29 +1,53 @@
 /*
-  align-interface.hh -- declare Align_interface
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 2000--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.
+
+  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 ALIGN_INTERFACE_HH
 #define ALIGN_INTERFACE_HH
 
-#include "axes.hh"
 #include "lily-proto.hh"
-#include "lily-guile.hh"
-
-struct Align_interface {
-  DECLARE_SCHEME_CALLBACK(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*);
-  DECLARE_SCHEME_CALLBACK(center_on_element, (SCM element, SCM axis));
+#include "std-vector.hh"
+#include "grob-interface.hh"
+
+class Align_interface
+{
+public:
+  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);
+  static vector<Real> get_minimum_translations_without_min_dist (Grob *, vector<Grob *> const &, Axis a);
+  static vector<Real> get_pure_minimum_translations (Grob *, vector<Grob *> const &,
+                                                     Axis a, 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 *);
+
+
+  static Real get_pure_child_y_translation (Grob *, Grob *child, int start, int end);
+
+protected:
+  static vector<Real> internal_get_minimum_translations (Grob *, vector<Grob *> const &,
+                                                         Axis a,
+                                                         bool include_fixed_spacing,
+                                                         bool pure, int start, int end);
 };
 
 #endif /* ALIGN_INTERFACE_HH */