X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fseparation-item.hh;h=f78fd0d6a945a3b245ed0df4cbd73bba399f4a35;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=74c0b0b4d3d5626507f75783c828f109fe4a4282;hpb=0af2486a28f1c60b9de929a9101964d880927e54;p=lilypond.git

diff --git a/lily/include/separation-item.hh b/lily/include/separation-item.hh
index 74c0b0b4d3..f78fd0d6a9 100644
--- a/lily/include/separation-item.hh
+++ b/lily/include/separation-item.hh
@@ -1,36 +1,43 @@
-/*   
-  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>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
 
-#ifndef SINGLE_MALT_GROUPING_ITEM_HH
-#define SINGLE_MALT_GROUPING_ITEM_HH
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-#include "lily-proto.hh"
+  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.
 
-/** 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
+  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.
 
-   Properties:
+  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
+#define SINGLE_MALT_GROUPING_ITEM_HH
+
+#include "lily-proto.hh"
+#include "direction.hh"
+#include "grob-interface.hh"
+#include "skyline.hh"
 
-   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*);
+  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 */