2003 -> 2004

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

diff --git a/lily/include/separation-item.hh b/lily/include/separation-item.hh
index 74c0b0b4d3d5626507f75783c828f109fe4a4282..99c9220574c4b6133f5acb6a896a9c3e0ca6de25 100644 (file)
--- 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--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -11,26 +11,17 @@
 #define SINGLE_MALT_GROUPING_ITEM_HH
 
 #include "lily-proto.hh"
+#include "direction.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 bool has_interface (Score_element*);
-  static Interval my_width (Score_element*) ;
-  static void add_item (Score_element*,Item*);
+  static bool has_interface (Grob*);
+  static Interval conditional_width (Grob*,Grob*) ;
+  static Interval width (Grob*) ;
+  static Interval relative_width (Grob*, Grob*) ;
+  static Grob*extremal_break_aligned_grob (Grob*,Direction, Interval*);
+  static void add_item (Grob*,Item*);
+  static void add_conditional_item (Grob*,Grob*);  
 };
 
 #endif /* SINGLE_MALT_GROUPING_ITEM_HH */