release: 1.1.1

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

diff --git a/lily/include/spanner.hh b/lily/include/spanner.hh
index ad205fcbf01b122590c68ed87ca9152be857d89f..255b21eaa82a245e10d81b48bceaa0227a3551ae 100644 (file)
--- a/lily/include/spanner.hh
+++ b/lily/include/spanner.hh
@@ -1,15 +1,16 @@
 /*
   spanner.hh -- part of GNU LilyPond
 
-  (c) 1996,97 Han-Wen Nienhuys
+  (c) 1996--1998 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
   symbol which spans across several columns, so its final appearance
@@ -31,21 +32,20 @@
   length of stems of notes they encompass.
 
   */
-class Spanner : public virtual Score_elem {
+class Spanner : public virtual Score_element {
 public:
-  
   Drul_array<Item*> spanned_drul_;
-  void set_bounds(Direction d, Item*);
+  void set_bounds (Direction d, Item*);
 
   DECLARE_MY_RUNTIME_TYPEINFO;
-  virtual Spanner* spanner() { return this; }    
-  Spanner();
-  bool broken_b() const;
-
+  Spanner ();
+  Spanner (Spanner const &);
+  bool broken_b () const;
+  virtual Array<Rod> get_rods () const;
   Spanner* find_broken_piece (Line_of_score*) const;
 protected:
-  void set_my_columns();
-  SCORE_ELEM_CLONE(Spanner);
+  void set_my_columns ();
+  SCORE_ELEMENT_CLONE (Spanner);
 
   /**
     this is virtual; for instance, Line_of_score overrides it.
@@ -53,13 +53,15 @@ protected:
   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_unlink ();
+  virtual void do_junk_links ();
   virtual void do_brew_molecule ();
-  virtual void do_break_processing();
-  virtual Interval do_width() const;
-  virtual void do_print() const;
-  virtual Line_of_score*line_l() const;
+  virtual void do_space_processing ();
+  virtual void do_break_processing ();
+  virtual Interval do_width () const;
+  virtual void do_print () const;
+  virtual Line_of_score*line_l () const;
 };
 #endif