Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/include/spanner.hh b/lily/include/spanner.hh
index b06c0a4cc009da320f33c2fc58f855476993c441..c64c61d6364a1f664b8a8fe334b1a32e1586636c 100644 (file)
--- a/lily/include/spanner.hh
+++ b/lily/include/spanner.hh
@@ -1,7 +1,7 @@
 /*
   spanner.hh -- part of GNU LilyPond
 
-  (c) 1996--2005 Han-Wen Nienhuys
+  (c) 1996--2006 Han-Wen Nienhuys
 */
 
 #ifndef SPANNER_HH
@@ -29,14 +29,16 @@
 class Spanner : public Grob
 {
   Drul_array<Item *> spanned_drul_;
-  int break_index_;
+  vsize break_index_;
+
+  DECLARE_CLASSNAME(Spanner);
 
 public:
   DECLARE_SCHEME_CALLBACK (set_spacing_rods, (SCM));
 
-  Link_array<Spanner> broken_intos_;
+  vector<Spanner*> broken_intos_;
 
-  int get_break_index () const;
+  vsize get_break_index () const;
 
   // todo: move to somewhere else.
   Real get_broken_left_end_align () const;
@@ -56,7 +58,7 @@ public:
 
   static int compare (Spanner *const &, Spanner *const &);
   virtual Grob *find_broken_piece (System *) const;
-  virtual SCM do_derived_mark () const;
+  virtual void derived_mark () const;
   static bool has_interface (Grob *);
   virtual System *get_system () const;