X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Falign-interface.hh;h=f893b75efd9172279de8b639c0ab5f1e5402cc49;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=fc3dc12f5e33bf24f5a6d8eb7b56f3089e4aec02;hpb=a6bd229f7fe1dc4a03478e14ccc0c0c66b225061;p=lilypond.git

diff --git a/lily/include/align-interface.hh b/lily/include/align-interface.hh
index fc3dc12f5e..f893b75efd 100644
--- a/lily/include/align-interface.hh
+++ b/lily/include/align-interface.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2000--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  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
@@ -24,23 +24,32 @@
 #include "std-vector.hh"
 #include "grob-interface.hh"
 
-struct Align_interface
+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,
-						bool safe, int start, int end);
+  DECLARE_SCHEME_CALLBACK (full_score_pure_minimum_translations, (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 *);
 
-  DECLARE_GROB_INTERFACE();
+  DECLARE_GROB_INTERFACE ();
 
   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 */