Ensure that even non-adjacent columns get a rod if they might collide.

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

diff --git a/lily/include/separation-item.hh b/lily/include/separation-item.hh
index 5bcb4e6e3ea5576cce909e7d9a4f630a9847d02b..d1280c7a9ea85995c5f430ba975e1ea4b490bbf8 100644 (file)
--- a/lily/include/separation-item.hh
+++ b/lily/include/separation-item.hh
@@ -16,16 +16,15 @@
 
 struct Separation_item
 {
-  DECLARE_GROB_INTERFACE();
-  DECLARE_SCHEME_CALLBACK(calc_skylines, (SCM));
+  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 Interval width (Grob *);
-  static Interval relative_width (Grob *, Grob *);
   static Grob *extremal_break_aligned_grob (Grob *, Direction, Interval *);
-  static bool set_distance (Drul_array<Item *>, Real);
-  static void set_skyline_distance (Drul_array<Item*>, Real);
+  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 *);
 };