Run `make grand-replace'.

[lilypond.git] / lily / include / separation-item.hh

diff --git a/lily/include/separation-item.hh b/lily/include/separation-item.hh
index 2beaedd56ad427c7fbdc62ce50ea47d05f47c4c0..c3c99ee5017c718f6afcca793921c48e8b1f2a3b 100644 (file)
--- a/lily/include/separation-item.hh
+++ b/lily/include/separation-item.hh
@@ -1,26 +1,32 @@
-/*   
+/*
   single-malt-grouping-item.hh -- declare Separation_item
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #ifndef SINGLE_MALT_GROUPING_ITEM_HH
 #define SINGLE_MALT_GROUPING_ITEM_HH
 
 #include "lily-proto.hh"
 #include "direction.hh"
+#include "grob-interface.hh"
+#include "skyline.hh"
 
 struct Separation_item
 {
-  static bool has_interface (Grob*);
-  static Interval conditional_width (Grob*,Grob*) ;
-  static Interval width (Grob*) ;
-  static Grob*extremal_break_aligned_grob (Grob*,Direction, Interval*);
-  static void add_item (Grob*,Item*);
-  static void add_conditional_item (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 *);
 };
 
 #endif /* SINGLE_MALT_GROUPING_ITEM_HH */