X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fspanner.hh;h=788b0e46ee46e1ef4889862b58d8c1bd4ed5a04e;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=24176326d3084e22f013a0b46fc49045e33c68a5;hpb=0e5d83a9ceb4a143f83d22406d7eb816314ff9f7;p=lilypond.git
diff --git a/lily/include/spanner.hh b/lily/include/spanner.hh
index 24176326d3..788b0e46ee 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
@@ -31,17 +44,26 @@ class Spanner : public Grob
Drul_array- 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));
+
+ static Spanner *unsmob (SCM s) {
+ return dynamic_cast (Grob::unsmob (s));
+ }
+ static bool is_smob (SCM s) {
+ return Grob::is_smob (s) && unsmob (s);
+ }
- 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);
@@ -61,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 ();
@@ -74,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