* VERSION (MY_PATCH_LEVEL): make 1.7.0

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

diff --git a/lily/include/spanner.hh b/lily/include/spanner.hh
index 0a5abcfa0fe676ba1da3dd6720c43f568e60e54f..e56560744e51b6d08c038e19b285a54e8156b475 100644 (file)
--- a/lily/include/spanner.hh
+++ b/lily/include/spanner.hh
@@ -31,15 +31,17 @@
   */
 class Spanner : public  Grob {
   Drul_array<Item*> spanned_drul_;
-
+  
 public:
-  DECLARE_SCHEME_CALLBACK (set_spacing_rods, (SCM ));
+  DECLARE_SCHEME_CALLBACK (set_spacing_rods, (SCM));
   
-  Link_array<Spanner> broken_into_l_arr_;
+  Link_array<Spanner> broken_intos_;
 
+  int break_index_;
   // 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*);
@@ -53,19 +55,17 @@ public:
 
   static int compare (Spanner * const &,Spanner * const &);
   virtual Grob* find_broken_piece (System*) const;
-  virtual SCM do_derived_mark ();
-    static bool has_interface (Grob*);
+  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 void do_break_processing ();
-  virtual System*line_l () const;
 };
 
-
-void add_bound_item (Spanner*, Item* n);
-void extend_spanner_over_elements (Grob*  span);
-
+void add_bound_item (Spanner*, Grob*);
+///DECLARE_UNSMOB (Spanner, spanner);
 
 #endif