release: 1.5.45

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

diff --git a/lily/include/spanner.hh b/lily/include/spanner.hh
index 9fb7f0bed6e5054cacede858a7f752f31f3e91c6..ebf5af6a8629e56940ef7a841532cdd4928c7f41 100644 (file)
--- a/lily/include/spanner.hh
+++ b/lily/include/spanner.hh
@@ -1,14 +1,14 @@
 /*
   spanner.hh -- part of GNU LilyPond
 
-  (c) 1996--2000 Han-Wen Nienhuys
+  (c) 1996--2002 Han-Wen Nienhuys
 */
 
 #ifndef SPANNER_HH
 #define SPANNER_HH
 
 #include "lily-proto.hh"
-#include "score-element.hh"
+#include "grob.hh"
 #include "drul-array.hh"
 #include "rod.hh"
 
@@ -29,15 +29,20 @@
   length of stems of notes they encompass.
 
   */
-class Spanner : public  Score_element {
+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.
+  Real get_broken_left_end_align () const;
+  
   // TODO: make virtual and do this for Items as well.
   Interval_t<int> spanned_rank_iv ();
-  void set_bound (Direction d, Score_element*);
+  void set_bound (Direction d, Grob*);
   Item *get_bound (Direction d) const;
   
   Spanner (SCM);
@@ -47,17 +52,19 @@ public:
   Real spanner_length () const;
 
   static int compare (Spanner * const &,Spanner * const &);
-  virtual Array<Rod> get_rods () const;
-  virtual Array<Spring> get_springs () const;  
-  virtual Score_element* find_broken_piece (Line_of_score*) const;
-  virtual void do_derived_mark ();
+  virtual Grob* find_broken_piece (System*) const;
+  virtual SCM do_derived_mark ();
 protected:
   void set_my_columns ();
-  VIRTUAL_COPY_CONS(Score_element);
-  Real get_broken_left_end_align () const;
 
-  virtual void do_space_processing ();
+  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);
+
+
 #endif