Run `make grand-replace'.

[lilypond.git] / lily / include / hara-kiri-group-spanner.hh

diff --git a/lily/include/hara-kiri-group-spanner.hh b/lily/include/hara-kiri-group-spanner.hh
index 7e3856e445a90ad11f7030d5ca6d1b4e342c9b3a..ec02a25b48ccc4d484983877edc53433765c2e7c 100644 (file)
--- a/lily/include/hara-kiri-group-spanner.hh
+++ b/lily/include/hara-kiri-group-spanner.hh
@@ -3,42 +3,28 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2008 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-
 #ifndef HARA_KIRI_VERTICAL_GROUP_SPANNER_HH
 #define HARA_KIRI_VERTICAL_GROUP_SPANNER_HH
 
-#include "lily-guile.hh"
 #include "lily-proto.hh"
+#include "grob-interface.hh"
 
-/** 
-  As Vertical_group_spanner, but keep track of interesting items.  If
-  we don't contain any interesting items after linebreaking, then
-  gracefully commit suicide.  Objective: don't disgrace Lily by
-  typesetting empty lines in orchestral scores.
-
-  properties:
-
-  items-worth-living -- list of interesting items. If empty in a particular system,
-    clear this line
-
-
-    todo: naming
-*/
-class Hara_kiri_group_spanner 
+class Hara_kiri_group_spanner
 {
 public:
-  static SCM force_hara_kiri_callback (SCM,SCM);
-  static Interval y_extent (Score_element * , Axis);
-  static SCM force_hara_kiri_in_parent_callback(SCM,SCM);
-  static void add_element (Score_element *me, Score_element *e);
-  static void set_interface (Score_element*me);
-  static bool has_interface (Score_element*);
-  static void consider_suicide (Score_element*me);
-  static void add_interesting_item (Score_element * me , Score_element* n);
+  DECLARE_SCHEME_CALLBACK (force_hara_kiri_callback, (SCM));
+  DECLARE_SCHEME_CALLBACK (y_extent, (SCM smob));
+  DECLARE_SCHEME_CALLBACK (calc_skylines, (SCM smob));
+  DECLARE_SCHEME_CALLBACK (pure_height, (SCM smob, SCM start, SCM end));
+  DECLARE_SCHEME_CALLBACK (force_hara_kiri_in_y_parent_callback, (SCM));
+  DECLARE_SCHEME_CALLBACK (after_line_breaking, (SCM));
+  DECLARE_GROB_INTERFACE();
+  static bool request_suicide (Grob *me, int start, int end);
+  static void consider_suicide (Grob *me);
+  static void add_interesting_item (Grob *me, Grob *n);
 };
 
-
 #endif // HARA_KIRI_VERTICAL_GROUP_SPANNER_HH