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

diff --git a/lily/include/separation-item.hh b/lily/include/separation-item.hh
index a7bfa6e21d..c3c99ee501 100644
--- a/lily/include/separation-item.hh
+++ b/lily/include/separation-item.hh
@@ -1,35 +1,32 @@
-/*   
+/*
   single-malt-grouping-item.hh -- declare Separation_item
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c)  1997--2000 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"
 
-/** Calc dimensions for the Separating_group_spanner; this has to be
-   an item to get dependencies correct.  It can't be an element_group
-   since these usually are in a different X_group
-
-   Properties:
-
-
-   elements -- list of items.
-   
-   no-spacing-rods -- read from elements: boolean that makes Separation_item ignore
-     this item
-   
-*/
 struct Separation_item
 {
-  static void set_interface (Score_element*);
-  static Interval my_width (Score_element*) ;
-  static void add_item (Score_element*,Item*);
+  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 */