release: 1.3.38

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

diff --git a/lily/include/spanner.hh b/lily/include/spanner.hh
index a43eff9855a338e6c355a31e6efe78a2ed80c2b9..2a50a826b2d986719502650e0ae2382c30888d7c 100644 (file)
--- a/lily/include/spanner.hh
+++ b/lily/include/spanner.hh
@@ -1,7 +1,7 @@
 /*
   spanner.hh -- part of GNU LilyPond
 
-  (c) 1996--1998 Han-Wen Nienhuys
+  (c) 1996--2000 Han-Wen Nienhuys
 */
 
 #ifndef SPANNER_HH
@@ -18,13 +18,10 @@
 
   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,36 +29,34 @@
   length of stems of notes they encompass.
 
   */
-class Spanner : public virtual Score_element {
-public:
+class Spanner : public  Score_element {
   Drul_array<Item*> spanned_drul_;
-  void set_bounds (Direction d, Item*);
 
+public:
+  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;
-  Spanner* find_broken_piece (Line_of_score*) 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;
 
-  /**
-    this is virtual; for instance, Line_of_score overrides it.
-    */
-  virtual void break_into_pieces ();
-
-  Link_array<Spanner> broken_into_l_arr_;
-  Spanner * unbroken_original_l_;
-
-  virtual void do_unlink ();
-  virtual void do_junk_links ();
-  virtual void do_brew_molecule ();
   virtual void do_space_processing ();
   virtual void do_break_processing ();
-  virtual Interval do_width () const;
-  virtual void do_print () const;
+  Real spanner_length () const;
   virtual Line_of_score*line_l () const;
 };
 #endif