patch::: 1.3.8.uu1

[lilypond.git] / lily / include / spanner.hh

diff --git a/lily/include/spanner.hh b/lily/include/spanner.hh
index 84c85f3e98f3ca6d43d3e1346950a84bd19829be..339280466640b8b7953bac84660047402faedd68 100644 (file)
--- a/lily/include/spanner.hh
+++ b/lily/include/spanner.hh
@@ -1,19 +1,20 @@
 /*
   spanner.hh -- part of GNU LilyPond
 
-  (c) 1996,97 Han-Wen Nienhuys
+  (c) 1996--1999 Han-Wen Nienhuys
 */
 
 #ifndef SPANNER_HH
 #define SPANNER_HH
 
 #include "lily-proto.hh"
-#include "score-elem.hh"
+#include "score-element.hh"
+#include "drul-array.hh"
+#include "rod.hh"
 
 
-#define SPANNER_CLONE(T) VIRTUAL_COPY_CONS(T, Spanner)
-
-/** a symbol which is attached between two columns. A spanner is a
+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.
 
@@ -33,25 +34,38 @@
   length of stems of notes they encompass.
 
   */
-class Spanner:public virtual Score_elem {
+class Spanner : public virtual Score_element {
 public:
-    PCol *left_col_l_, *right_col_l_;
-    
-    /* *************** */
-    NAME_MEMBERS();
-    virtual Spanner* spanner() { return this; }    
-    Spanner();
-    bool broken_b() const;
-    Spanner* find_broken_piece(Line_of_score*)const;
+  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;
+
+  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:
-    SPANNER_CLONE(Spanner)
-    virtual void break_into_pieces();
-
-    Link_array<Spanner> broken_into_l_arr_;
-       
-    virtual void do_break_processing();
-    virtual Interval do_width()const;
-    virtual void do_print()const;
-    virtual Line_of_score*line_l()const;
+  void set_my_columns ();
+  VIRTUAL_COPY_CONS(Score_element);
+
+  /**
+    this is virtual; for instance, Line_of_score overrides it.
+    */
+  virtual void break_into_pieces ();
+  Real get_broken_left_end_align () const;
+
+  friend Axis_group_spanner; // UGH
+
+  virtual void do_space_processing ();
+  void handle_broken_dependents ();
+  virtual void do_break_processing ();
+  virtual Interval do_width () const;
+  virtual void do_print () const;
+  virtual Line_of_score*line_l () const;
 };
 #endif