X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fspanner.hh;h=6c0fc1cbed436b0a4bebb5dcefc381663033df00;hb=26380ed75fbd7b32781715c043dfa5dd96dfbe4a;hp=7736ed8610c3539b1d6d153991aa7b9992eeaf1f;hpb=bb36bac02a64770871780231ecc709cb18b20932;p=lilypond.git

diff --git a/lily/include/spanner.hh b/lily/include/spanner.hh
index 7736ed8610..6c0fc1cbed 100644
--- a/lily/include/spanner.hh
+++ b/lily/include/spanner.hh
@@ -1,63 +1,71 @@
 /*
   spanner.hh -- part of GNU LilyPond
 
-  (c) 1996--2000 Han-Wen Nienhuys
+  (c) 1996--2005 Han-Wen Nienhuys
 */
 
 #ifndef SPANNER_HH
 #define SPANNER_HH
 
-#include "lily-proto.hh"
-#include "score-element.hh"
-#include "drul-array.hh"
+#include "grob.hh"
 #include "rod.hh"
 
-
-class Axis_group_spanner;
 /** 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.
-
-  Examples
-
-  \begin{itemize}
-  \item (de)crescendo
-  \item slur
-  \item beam
-  \item bracket
-  \end{itemize}
-  
-
-  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 virtual Score_element {
+    symbol which spans across several columns, so its final appearance
+    can only be calculated after the breaking problem is solved.
+
+    Examples
+
+    * (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_;
+  int break_index_;
+
 public:
-  Drul_array<Item*> spanned_drul_;
-  Link_array<Spanner> broken_into_l_arr_;
-  void set_bounds (Direction d, Item*);
-
-  
-  Spanner ();
-  Spanner (Spanner const &);
-  bool broken_b () const;
+  DECLARE_SCHEME_CALLBACK (set_spacing_rods, (SCM));
+
+  Link_array<Spanner> broken_intos_;
+
+  int get_break_index () 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 *);
+  Item *get_bound (Direction d) const;
+
+  Spanner (SCM, Object_key const *);
+  Spanner (Spanner const &, int copy_count);
+  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 *);
+  virtual System *get_system () const;
 
-  static int compare (Spanner * const &,Spanner * const &);
-  virtual Array<Rod> get_rods () const;
-  virtual Array<Spring> get_springs () const;  
-  virtual Score_element* find_broken_piece (Line_of_score*) const;
 protected:
   void set_my_columns ();
-  VIRTUAL_COPY_CONS(Score_element);
-  Real get_broken_left_end_align () const;
-
-  virtual void do_space_processing ();
+  virtual Grob *clone (int count) const;
   virtual void do_break_processing ();
-  Real spanner_length () const;
-  virtual Line_of_score*line_l () const;
 };
+
+void add_bound_item (Spanner *, Grob *);
+
+bool spanner_less (Spanner *s1, Spanner *s2);
+int broken_spanner_index (Spanner *sp);
 #endif