Update to new system-count function names.

[lilypond.git] / lily / include / spanner.hh

diff --git a/lily/include/spanner.hh b/lily/include/spanner.hh
index 03cb986634ee60484ed59c2d8e7eacc5674c7a3a..9ea2df7870bb2c83a083f1d5d03053633cd62998 100644 (file)
--- a/lily/include/spanner.hh
+++ b/lily/include/spanner.hh
@@ -1,7 +1,7 @@
 /*
   spanner.hh -- part of GNU LilyPond
 
-  (c) 1996--2001 Han-Wen Nienhuys
+  (c) 1996--2002 Han-Wen Nienhuys
 */
 
 #ifndef SPANNER_HH
@@ -33,6 +33,8 @@ class Spanner : public  Grob {
   Drul_array<Item*> spanned_drul_;
 
 public:
+  DECLARE_SCHEME_CALLBACK (set_spacing_rods, (SCM));
+  
   Link_array<Spanner> broken_into_l_arr_;
 
   // todo: move to somewhere else.
@@ -50,18 +52,19 @@ public:
   Real spanner_length () const;
 
   static int compare (Spanner * const &,Spanner * const &);
-  virtual Grob* find_broken_piece (Line_of_score*) const;
+  virtual Grob* find_broken_piece (System*) const;
   virtual SCM do_derived_mark ();
+  static bool has_interface (Grob*);
 protected:
   void set_my_columns ();
+
   VIRTUAL_COPY_CONS (Grob);
   virtual void do_break_processing ();
-  virtual Line_of_score*line_l () const;
+  virtual System*line_l () const;
 };
 
 
-void add_bound_item (Spanner*, Item* n);
-void extend_spanner_over_elements (Grob*  span);
-
+void add_bound_item (Spanner*, Grob*);
+///DECLARE_UNSMOB (Spanner, spanner);
 
 #endif