X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fseparation-item.hh;h=40b518e97a1b3bd3b79f94e8c078cfcac4ecb46a;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=c5d7c7106ac0b4aab0f121383559f887f6f69af9;hpb=2c8c61b3a5cddbb155786a1ca027528701c91ac9;p=lilypond.git

diff --git a/lily/include/separation-item.hh b/lily/include/separation-item.hh
index c5d7c7106a..40b518e97a 100644
--- a/lily/include/separation-item.hh
+++ b/lily/include/separation-item.hh
@@ -1,9 +1,20 @@
 /*
-  single-malt-grouping-item.hh -- declare Separation_item
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef SINGLE_MALT_GROUPING_ITEM_HH
@@ -12,14 +23,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 *);
 };