X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fspanner.hh;h=074c303036877afe40c8536479719eebb6b18f51;hb=862601226f319d2395794fe1175e7f17485b8e19;hp=b046ab1a5f94c97b9c3bed5bbfc9650ec1528b18;hpb=f3467e6b78be6d8497cf4d0a43ffd01656a33300;p=lilypond.git

diff --git a/lily/include/spanner.hh b/lily/include/spanner.hh
index b046ab1a5f..074c303036 100644
--- a/lily/include/spanner.hh
+++ b/lily/include/spanner.hh
@@ -1,83 +1,74 @@
 /*
   spanner.hh -- part of GNU LilyPond
 
-  (c) 1996--1999 Han-Wen Nienhuys
+  (c) 1996--2006 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"
 
-struct Breaking_information
+/** 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
+
+    * (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
 {
-  Line_of_score *line_l_;
-  Spanner * broken_spanner_l_;
-  Drul_array<Item*> bounds_;
-  Breaking_information ()
-    {
-      line_l_ =0;
-      broken_spanner_l_ =0;
-      bounds_[LEFT] = bounds_[RIGHT] =0;
-    }
-};
+  Drul_array<Item *> spanned_drul_;
+  vsize break_index_;
+
+  DECLARE_CLASSNAME(Spanner);
 
-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 {
 public:
-  Drul_array<Item*> spanned_drul_;
-  void set_bounds (Direction d, Item*);
-
-  
-  Spanner ();
-  Spanner (Spanner const &);
-  bool broken_b () const;
-  virtual Array<Rod> get_rods () const;
-  virtual Spanner* find_broken_piece (Line_of_score*) const;
-protected:
-  void set_my_columns ();
-  VIRTUAL_COPY_CONS(Score_element);
+  DECLARE_SCHEME_CALLBACK (set_spacing_rods, (SCM));
+
+  vector<Spanner*> broken_intos_;
+
+  vsize 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_substitute_grob_array (SCM sym, Grob_array *);
 
-  /**
-    this is virtual; for instance, Line_of_score overrides it.
-    */
-  virtual void break_into_pieces ();
+  virtual Interval_t<int> spanned_rank_iv ();
+  void set_bound (Direction d, Grob *);
+  Item *get_bound (Direction d) const;
 
-  Array<Breaking_information> broken_info_;
-  friend Axis_group_spanner; // UGH
+  Spanner (SCM, Object_key const *);
+  Spanner (Spanner const &, int copy_count);
+  bool is_broken () const;
+  void do_break ();
+  Real spanner_length () const;
 
-  Spanner * unbroken_original_l_;
+  static int compare (Spanner *const &, Spanner *const &);
+  virtual Grob *find_broken_piece (System *) const;
+  virtual void derived_mark () const;
+  static bool has_interface (Grob *);
+  virtual System *get_system () const;
 
-  virtual void do_unlink ();
-  virtual void do_junk_links ();
-  virtual void output_processing ();
-  virtual void do_space_processing ();
+protected:
+  void set_my_columns ();
+  virtual Grob *clone (int count) const;
   virtual void do_break_processing ();
-  virtual Interval do_width () const;
-  virtual void do_print () 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