X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fspanner.hh;h=f618e9c58ef3f8ef1fb8cbfe701518df2a204754;hb=5e59ddc20f08184abb9f65789338043824046e2b;hp=834c1c8e6e4b5c440f0cd3439ea873e1eb4cc2c5;hpb=55ac733b69643a6bc6a83b706c65cb56efd388ef;p=lilypond.git

diff --git a/lily/include/spanner.hh b/lily/include/spanner.hh
index 834c1c8e6e..f618e9c58e 100644
--- a/lily/include/spanner.hh
+++ b/lily/include/spanner.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1996--2011 Han-Wen Nienhuys
+  Copyright (C) 1996--2014 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
@@ -44,18 +44,26 @@ class Spanner : public Grob
   Drul_array<Item *> spanned_drul_;
   vsize break_index_;
 
-  DECLARE_CLASSNAME(Spanner);
+  DECLARE_CLASSNAME (Spanner);
 
 public:
   DECLARE_SCHEME_CALLBACK (set_spacing_rods, (SCM));
+  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_;
+  static Spanner *unsmob (SCM s) {
+    return dynamic_cast <Spanner *> (Grob::unsmob (s));
+  }
+  static bool is_smob (SCM s) {
+    return Grob::is_smob (s) && unsmob (s);
+  }
+
+  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);
@@ -75,10 +83,15 @@ public:
   static bool less (Spanner *const &, Spanner *const &);
   virtual Grob *find_broken_piece (System *) const;
   virtual void derived_mark () const;
-  DECLARE_GROB_INTERFACE();
+  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:
+  SCM pure_property_cache_;
+
   void set_my_columns ();
   virtual Grob *clone () const;
   virtual void do_break_processing ();
@@ -88,5 +101,4 @@ protected:
 void add_bound_item (Spanner *, Grob *);
 
 bool spanner_less (Spanner *s1, Spanner *s2);
-int broken_spanner_index (Spanner const *sp);
 #endif