Merge with master

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

diff --git a/lily/include/separating-group-spanner.hh b/lily/include/separating-group-spanner.hh
index cb644e0729523e17aea12dcefdf5b0ac2f098c5b..d48705c85914ef01b8fe7d99c99d57bb83a7a1c4 100644 (file)
--- a/lily/include/separating-group-spanner.hh
+++ b/lily/include/separating-group-spanner.hh
@@ -1,28 +1,28 @@
-/*   
+/*
   separating-group-spanner.hh -- declare Separating_group_spanner
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1998--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #ifndef SEPARATING_GROUP_SPANNER_HH
 #define SEPARATING_GROUP_SPANNER_HH
 
-#include "spanner.hh"
+#include "grob-interface.hh"
+#include "lily-proto.hh"
 
-
-class Separating_group_spanner : public Spanner
+class Separating_group_spanner
 {
-  Link_array<Single_malt_grouping_item> spacing_unit_l_arr_;
+  static void find_rods (Item *,
+                        vector<Grob*> const &separators,
+                        vsize idx,
+                        Real);
 public:
-  Separating_group_spanner ();
-  void add_spacing_unit (Single_malt_grouping_item*);
-protected:
-  VIRTUAL_COPY_CONS(Score_element);
-  virtual Array<Rod> get_rods () const;
-  virtual void do_substitute_element_pointer (Score_element*,Score_element*);
+  static void add_spacing_unit (Grob *me, Item *);
+
+  DECLARE_GROB_INTERFACE();
+  DECLARE_SCHEME_CALLBACK (set_spacing_rods, (SCM));
 };
 
 #endif /* SEPARATING_GROUP_SPANNER_HH */