X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Falign-interface.hh;h=fc3dc12f5e33bf24f5a6d8eb7b56f3089e4aec02;hb=31bd10a19f2c5ef537044bc99982aaecd0d4a16c;hp=4f1d3491419a228a2604d6bf789345d82d8738d8;hpb=474c8729dc274a30558102a015a01fa5882673db;p=lilypond.git

diff --git a/lily/include/align-interface.hh b/lily/include/align-interface.hh
index 4f1d349141..fc3dc12f5e 100644
--- a/lily/include/align-interface.hh
+++ b/lily/include/align-interface.hh
@@ -1,9 +1,20 @@
 /*
-  align-interface.hh -- declare Align_interface
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2000--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2000--2007 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
@@ -15,13 +26,13 @@
 
 struct Align_interface
 {
-  DECLARE_SCHEME_CALLBACK (calc_positioning_done, (SCM));
-  DECLARE_SCHEME_CALLBACK (stretch_after_break, (SCM element));
-  static void align_to_fixed_distance (Grob *, 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);
+  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 *);
@@ -32,7 +43,5 @@ struct Align_interface
   static Real get_pure_child_y_translation (Grob *, Grob *child, int start, int end);
 };
 
-Grob *find_fixed_alignment_parent (Grob *g);
-
 #endif /* ALIGN_INTERFACE_HH */