release: 1.3.56

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

diff --git a/lily/include/spanner.hh b/lily/include/spanner.hh
index 6ef182fe1324235b25c307b6c82292d83b24d559..34339a18f96db4c95ce4027bc1f002c32e763748 100644 (file)
--- a/lily/include/spanner.hh
+++ b/lily/include/spanner.hh
@@ -1,7 +1,7 @@
 /*
   spanner.hh -- part of GNU LilyPond
 
-  (c) 1996--1999 Han-Wen Nienhuys
+  (c) 1996--2000 Han-Wen Nienhuys
 */
 
 #ifndef SPANNER_HH
@@ -12,21 +12,16 @@
 #include "drul-array.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}
-  
+  * (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
@@ -34,14 +29,18 @@ class Axis_group_spanner;
   length of stems of notes they encompass.
 
   */
-class Spanner : public virtual Score_element {
-public:
+class Spanner : public  Score_element {
   Drul_array<Item*> spanned_drul_;
+
+public:
   Link_array<Spanner> broken_into_l_arr_;
-  void set_bounds (Direction d, Item*);
 
+  // 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 (SCM);
   Spanner (Spanner const &);
   bool broken_b () const;
   void do_break ();
@@ -50,18 +49,12 @@ public:
   virtual Array<Rod> get_rods () const;
   virtual Array<Spring> get_springs () const;  
   virtual Score_element* find_broken_piece (Line_of_score*) const;
+  virtual void do_derived_mark ();
 protected:
   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 ();
   virtual void do_break_processing ();
   Real spanner_length () const;