X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fspanner.hh;h=94e98760c0560a857517659a1a0ba20a8a2f50a0;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=b06c0a4cc009da320f33c2fc58f855476993c441;hpb=e6caaa132f59006e5c47d0007b24bfedd07ad145;p=lilypond.git

diff --git a/lily/include/spanner.hh b/lily/include/spanner.hh
index b06c0a4cc0..94e98760c0 100644
--- 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--2008 Han-Wen Nienhuys
 */
 
 #ifndef SPANNER_HH
@@ -29,45 +29,50 @@
 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));
+  DECLARE_SCHEME_CALLBACK (bounds_width, (SCM));
 
-  Link_array<Spanner> broken_intos_;
-
-  int get_break_index () const;
+  vector<Spanner*> broken_intos_;
 
+  vsize get_break_index () const;
+  Spanner *broken_neighbor (Direction d) 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 ();
+  Interval_t<Moment> spanned_time () const;
+  virtual Interval_t<int> spanned_rank_interval () const;
   void set_bound (Direction d, Grob *);
   Item *get_bound (Direction d) const;
 
-  Spanner (SCM, Object_key const *);
-  Spanner (Spanner const &, int copy_count);
+  Spanner (SCM);
+  Spanner (Spanner const &);
   bool is_broken () const;
   void do_break ();
   Real spanner_length () const;
 
   static int compare (Spanner *const &, Spanner *const &);
+  static bool less (Spanner *const &, Spanner *const &);
   virtual Grob *find_broken_piece (System *) const;
-  virtual SCM do_derived_mark () const;
-  static bool has_interface (Grob *);
+  virtual void derived_mark () const;
+  DECLARE_GROB_INTERFACE();
   virtual System *get_system () const;
 
 protected:
   void set_my_columns ();
-  virtual Grob *clone (int count) const;
+  virtual Grob *clone () const;
   virtual void do_break_processing ();
+  bool fast_substitute_grob_array (SCM sym, Grob_array *);
 };
 
 void add_bound_item (Spanner *, Grob *);
 
 bool spanner_less (Spanner *s1, Spanner *s2);
-int broken_spanner_index (Spanner *sp);
+int broken_spanner_index (Spanner const *sp);
 #endif