* lily/lyric-engraver.cc (get_current_rest): New function.

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

diff --git a/lily/include/spanner.hh b/lily/include/spanner.hh
index b4aa9f99984e3e9986ffcc45c495aa2a6ebb0ad2..c4670d0122bd78def662a0a791abd21f27170f77 100644 (file)
--- a/lily/include/spanner.hh
+++ b/lily/include/spanner.hh
@@ -1,7 +1,7 @@
 /*
   spanner.hh -- part of GNU LilyPond
 
-  (c)  1996--2003 Han-Wen Nienhuys
+  (c) 1996--2004 Han-Wen Nienhuys
 */
 
 #ifndef SPANNER_HH
@@ -31,13 +31,14 @@
   */
 class Spanner : public  Grob {
   Drul_array<Item*> spanned_drul_;
+  int break_index_;
   
 public:
   DECLARE_SCHEME_CALLBACK (set_spacing_rods, (SCM));
   
   Link_array<Spanner> broken_intos_;
 
-  int break_index_;
+  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)  ;
@@ -49,7 +50,7 @@ public:
   
   Spanner (SCM);
   Spanner (Spanner const &);
-  bool broken_b () const;
+  bool is_broken () const;
   void do_break ();
   Real spanner_length () const;
 
@@ -58,14 +59,16 @@ public:
   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_COPY_CONSTRUCTOR (Grob, Spanner);
   virtual void do_break_processing ();
 };
 
 void add_bound_item (Spanner*, Grob*);
-///DECLARE_UNSMOB (Spanner, spanner);
 
+bool spanner_less ( Spanner *s1, Spanner* s2);
+int broken_spanner_index (Spanner * sp);
 #endif