X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fspanner.hh;h=a5ecd3dae92c451a259a45b2fa92f2702d63c651;hb=6233e12249f74e19aff5ee5afa66e81c0f8b7259;hp=57dcb9271eab238fab161bb6362e97efde704a1f;hpb=131eeda0980667a4aeac1742f0f29961c16cb7e0;p=lilypond.git
diff --git a/lily/include/spanner.hh b/lily/include/spanner.hh
index 57dcb9271e..a5ecd3dae9 100644
--- a/lily/include/spanner.hh
+++ b/lily/include/spanner.hh
@@ -1,7 +1,20 @@
/*
- spanner.hh -- part of GNU LilyPond
+ This file is part of LilyPond, the GNU music typesetter.
- (c) 1996--2009 Han-Wen Nienhuys
+ Copyright (C) 1996--2015 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 .
*/
#ifndef SPANNER_HH
@@ -26,23 +39,31 @@
is absolutely necessary for beams, since they have to adjust the
length of stems of notes they encompass.
*/
-class Spanner : public Grob
+
+struct Preinit_Spanner
{
Drul_array- spanned_drul_;
+ SCM pure_property_cache_;
+ Preinit_Spanner ();
+};
+
+class Spanner : Preinit_Spanner, public Grob
+{
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 broken_intos_;
+ vector 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);
@@ -62,9 +83,11 @@ public:
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 ();
virtual Grob *clone () const;
@@ -75,5 +98,4 @@ protected:
void add_bound_item (Spanner *, Grob *);
bool spanner_less (Spanner *s1, Spanner *s2);
-int broken_spanner_index (Spanner const *sp);
#endif