* lily/ various: Introduce stream events of types Prepare,

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

diff --git a/lily/include/spanner.hh b/lily/include/spanner.hh
index 77f272b4cabe9e397b0afb2a24ba9069eb660cc7..074c303036877afe40c8536479719eebb6b18f51 100644 (file)
--- a/lily/include/spanner.hh
+++ b/lily/include/spanner.hh
@@ -29,24 +29,23 @@
 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;
   void substitute_one_mutable_property (SCM sym, SCM val);
   bool fast_substitute_grob_array (SCM sym, Grob_array *);
 
-  // TODO: make virtual and do this for Items as well.
-  Interval_t<int> spanned_rank_iv ();
+  virtual Interval_t<int> spanned_rank_iv ();
   void set_bound (Direction d, Grob *);
   Item *get_bound (Direction d) const;