(SCM_VECTOR_P): Compile fix.

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

diff --git a/lily/include/spanner.hh b/lily/include/spanner.hh
index 9ea2df7870bb2c83a083f1d5d03053633cd62998..ac5706de829c38f1ac8f20929dc679a53c501b0b 100644 (file)
--- a/lily/include/spanner.hh
+++ b/lily/include/spanner.hh
@@ -1,15 +1,13 @@
 /*
   spanner.hh -- part of GNU LilyPond
 
-  (c) 1996--2002 Han-Wen Nienhuys
+  (c) 1996--2004 Han-Wen Nienhuys
 */
 
 #ifndef SPANNER_HH
 #define SPANNER_HH
 
-#include "lily-proto.hh"
 #include "grob.hh"
-#include "drul-array.hh"
 #include "rod.hh"
 
 /** A symbol which is attached between two columns. A spanner is a
@@ -31,40 +29,43 @@
   */
 class Spanner : public  Grob {
   Drul_array<Item*> spanned_drul_;
-
+  int break_index_;
+  
 public:
   DECLARE_SCHEME_CALLBACK (set_spacing_rods, (SCM));
   
-  Link_array<Spanner> broken_into_l_arr_;
+  Link_array<Spanner> broken_intos_;
 
+  int get_break_index () const;
   // todo: move to somewhere else.
   Real get_broken_left_end_align () const;
-  
+  void substitute_one_mutable_property (SCM sym, SCM val)  ;
+  bool fast_fubstitute_grob_list (SCM sym, SCM grob_list);
   // TODO: make virtual and do this for Items as well.
   Interval_t<int> spanned_rank_iv ();
   void set_bound (Direction d, Grob*);
   Item *get_bound (Direction d) const;
   
-  Spanner (SCM);
-  Spanner (Spanner const &);
-  bool broken_b () const;
+  Spanner (SCM, Object_key const*);
+  Spanner (Spanner const &, int copy_count);
+  bool is_broken () const;
   void do_break ();
   Real spanner_length () const;
 
   static int compare (Spanner * const &,Spanner * const &);
   virtual Grob* find_broken_piece (System*) const;
-  virtual SCM do_derived_mark ();
+  virtual SCM do_derived_mark () const;
   static bool has_interface (Grob*);
+  virtual System *get_system () const;
+
 protected:
   void set_my_columns ();
-
-  VIRTUAL_COPY_CONS (Grob);
+  virtual Grob *clone (int count) const;
   virtual void do_break_processing ();
-  virtual System*line_l () const;
 };
 
-
 void add_bound_item (Spanner*, Grob*);
-///DECLARE_UNSMOB (Spanner, spanner);
 
+bool spanner_less ( Spanner *s1, Spanner* s2);
+int broken_spanner_index (Spanner * sp);
 #endif