X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fspanner.hh;h=7bda060c864d20d3920837b0ce861fac92d2ee25;hb=8a52af2ae812fd16bc8f875099ab53e89bbacd26;hp=40617f18e131b8fe1028f8a924488b701b7aaaf2;hpb=7e72a1e50e94a7f9738d62599de79fe7745f600c;p=lilypond.git

diff --git a/lily/include/spanner.hh b/lily/include/spanner.hh
index 40617f18e1..7bda060c86 100644
--- a/lily/include/spanner.hh
+++ b/lily/include/spanner.hh
@@ -1,73 +1,97 @@
 /*
-  spanner.hh -- part of GNU LilyPond
+  This file is part of LilyPond, the GNU music typesetter.
 
-  (c) 1996--2004 Han-Wen Nienhuys
+  Copyright (C) 1996--2011 Han-Wen Nienhuys
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef SPANNER_HH
 #define SPANNER_HH
 
-#include "lily-proto.hh"
 #include "grob.hh"
-#include "drul-array.hh"
 #include "rod.hh"
 
 /** A symbol which is attached between two columns. A spanner is a
-  symbol which spans across several columns, so its final appearance
-  can only be calculated after the breaking problem is solved.
+    symbol which spans across several columns, so its final appearance
+    can only be calculated after the breaking problem is solved.
+
+    Examples
 
-  Examples
+    * (de)crescendo
+    * slur
+    * beam
+    * bracket
 
-  * (de)crescendo
-  * slur
-  * beam
-  * bracket
+    Spanner should know about the items which it should consider:
+    e.g. slurs should be steep enough to "enclose" all those items. This
+    is absolutely necessary for beams, since they have to adjust the
+    length of stems of notes they encompass.
+*/
+class Spanner : public Grob
+{
+  Drul_array<Item *> spanned_drul_;
+  vsize break_index_;
 
-  Spanner should know about the items which it should consider:
-  e.g. slurs should be steep enough to "enclose" all those items. This
-  is absolutely necessary for beams, since they have to adjust the
-  length of stems of notes they encompass.
+  DECLARE_CLASSNAME(Spanner);
 
-  */
-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_;
+  DECLARE_SCHEME_CALLBACK (calc_normalized_endpoints, (SCM));
+  DECLARE_SCHEME_CALLBACK (bounds_width, (SCM));
+  DECLARE_SCHEME_CALLBACK (kill_zero_spanned_time, (SCM));
+
+  vector<Spanner*> broken_intos_;
 
-  int get_break_index () const;
+  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_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*);
+  void substitute_one_mutable_property (SCM sym, SCM val);
+
+  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);
   Spanner (Spanner const &);
-  bool broken_b () const;
+  bool is_broken () const;
   void do_break ();
   Real spanner_length () const;
 
-  static int compare (Spanner * const &,Spanner * const &);
-  virtual Grob* find_broken_piece (System*) const;
-  virtual SCM do_derived_mark () const;
-  static bool has_interface (Grob*);
+  static int compare (Spanner *const &, Spanner *const &);
+  static bool less (Spanner *const &, Spanner *const &);
+  virtual Grob *find_broken_piece (System *) const;
+  virtual void derived_mark () const;
+  DECLARE_GROB_INTERFACE();
   virtual System *get_system () const;
+
+  SCM get_cached_pure_property (SCM sym, int start, int end);
+  void cache_pure_property (SCM sym, int start, int end, SCM value);
+
 protected:
-  void set_my_columns ();
+  SCM pure_property_cache_;
 
-  VIRTUAL_COPY_CONS (Grob);
+  void set_my_columns ();
+  virtual Grob *clone () const;
   virtual void do_break_processing ();
+  bool fast_substitute_grob_array (SCM sym, Grob_array *);
 };
 
-void add_bound_item (Spanner*, Grob*);
-///DECLARE_UNSMOB (Spanner, spanner);
+void add_bound_item (Spanner *, Grob *);
 
-int broken_spanner_index (Spanner * sp);
+bool spanner_less (Spanner *s1, Spanner *s2);
 #endif