X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fspanner.hh;h=cce03ee4372035978320839b57213f6e8e9628f9;hb=d8f40e4ee05a7a7175711859c36c1bb5a0f305ec;hp=7a21c3a917b2035ec0dab9f59f8b8e5e4fde6be2;hpb=df4a7c4a55148e065d878dcc2f7e09ac27ea9c32;p=lilypond.git
diff --git a/lily/include/spanner.hh b/lily/include/spanner.hh
index 7a21c3a917..cce03ee437 100644
--- a/lily/include/spanner.hh
+++ b/lily/include/spanner.hh
@@ -1,67 +1,97 @@
/*
- spanner.hh -- part of GNU LilyPond
+ This file is part of LilyPond, the GNU music typesetter.
- (c) 1996--2000 Han-Wen Nienhuys
+ Copyright (C) 1996--2012 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
#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.
+ 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- spanned_drul_;
+ vsize break_index_;
- */
-class Spanner : public Grob {
- Drul_array
- spanned_drul_;
+ DECLARE_CLASSNAME (Spanner);
public:
- Link_array broken_into_l_arr_;
+ 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_;
+
+ vsize get_break_index () const;
+ Spanner *broken_neighbor (Direction d) const;
// todo: move to somewhere else.
Real get_broken_left_end_align () const;
-
- // TODO: make virtual and do this for Items as well.
- Interval_t spanned_rank_iv ();
- void set_bound (Direction d, Grob*);
+ void substitute_one_mutable_property (SCM sym, SCM val);
+
+ Interval_t spanned_time () const;
+ virtual Interval_t 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 (Line_of_score*) const;
- virtual SCM do_derived_mark ();
+ 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:
+ SCM pure_property_cache_;
+
void set_my_columns ();
- VIRTUAL_COPY_CONS(Grob);
+ virtual Grob *clone () const;
virtual void do_break_processing ();
- virtual Line_of_score*line_l () const;
+ bool fast_substitute_grob_array (SCM sym, Grob_array *);
};
+void add_bound_item (Spanner *, Grob *);
-void add_bound_item (Spanner*, Item* n);
-void extend_spanner_over_elements (Grob* span);
-
-
+bool spanner_less (Spanner *s1, Spanner *s2);
#endif