X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fseparation-item.hh;h=c3c99ee5017c718f6afcca793921c48e8b1f2a3b;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=c5d7c7106ac0b4aab0f121383559f887f6f69af9;hpb=44ad1d66c072e4d6545e75c769c86a460cb1df13;p=lilypond.git

diff --git a/lily/include/separation-item.hh b/lily/include/separation-item.hh
index c5d7c7106a..c3c99ee501 100644
--- a/lily/include/separation-item.hh
+++ b/lily/include/separation-item.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SINGLE_MALT_GROUPING_ITEM_HH
@@ -12,14 +12,19 @@
 #include "lily-proto.hh"
 #include "direction.hh"
 #include "grob-interface.hh"
+#include "skyline.hh"
 
 struct Separation_item
 {
-  DECLARE_GROB_INTERFACE();
-  static Interval conditional_width (Grob *, Grob *);
-  static Interval width (Grob *);
-  static Interval relative_width (Grob *, Grob *);
+  DECLARE_GROB_INTERFACE ();
+  DECLARE_SCHEME_CALLBACK (calc_skylines, (SCM));
+  DECLARE_SCHEME_CALLBACK (print, (SCM));
+
+  static vector<Box> boxes (Grob *me, Grob *left);
+  static Skyline conditional_skyline (Grob *, Grob *);
   static Grob *extremal_break_aligned_grob (Grob *, Direction, Interval *);
+  static Real set_distance (Item *left, Item *right, Real padding);
+  static bool is_empty (Grob *me);
   static void add_item (Grob *, Item *);
   static void add_conditional_item (Grob *, Grob *);
 };