release: 1.3.38

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

diff --git a/lily/include/spanner.hh b/lily/include/spanner.hh
index 2aee51cc2e56dbd4fe80ee951e2dc96244baa31d..2a50a826b2d986719502650e0ae2382c30888d7c 100644 (file)
--- a/lily/include/spanner.hh
+++ b/lily/include/spanner.hh
@@ -1,30 +1,27 @@
 /*
   spanner.hh -- part of GNU LilyPond
 
-  (c) 1996,97 Han-Wen Nienhuys
+  (c) 1996--2000 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"
 
-
-
-/** a symbol which is attached between two columns. A spanner is a
+/** 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}
-  
+  * (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
@@ -32,25 +29,34 @@
   length of stems of notes they encompass.
 
   */
-class Spanner:public virtual Score_elem {
+class Spanner : public  Score_element {
+  Drul_array<Item*> spanned_drul_;
+
 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;
+  Link_array<Spanner> broken_into_l_arr_;
+
+  // TODO: make virtual and do this for Items as well.
+  Interval_t<int> spanned_rank_iv ();
+  void set_bound (Direction d, Item*);
+  Item *get_bound (Direction d) const;
+  
+  Spanner ();
+  Spanner (Spanner const &);
+  bool broken_b () const;
+  void do_break ();
+
+  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:
-    SCORE_ELEM_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);
+  Real get_broken_left_end_align () const;
+
+  virtual void do_space_processing ();
+  virtual void do_break_processing ();
+  Real spanner_length () const;
+  virtual Line_of_score*line_l () const;
 };
 #endif