patch::: 1.3.32.hwn2

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

diff --git a/lily/include/spanner.hh b/lily/include/spanner.hh
index 8ad3caa31fa0dab0385c236ca039367ff6d33439..130604b86303cdfc1b4dedcbf960471b29580d7b 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,18 +12,6 @@
 #include "drul-array.hh"
 #include "rod.hh"
 
-struct Breaking_information
-{
-  Line_of_score *line_l_;
-  Spanner * broken_spanner_l_;
-  Drul_array<Item*> bounds_;
-  Breaking_information ()
-    {
-      line_l_ =0;
-      broken_spanner_l_ =0;
-      bounds_[LEFT] = bounds_[RIGHT] =0;
-    }
-};
 
 class Axis_group_spanner;
 /** A symbol which is attached between two columns. A spanner is a
@@ -47,34 +35,30 @@ class Axis_group_spanner;
 
   */
 class Spanner : public virtual Score_element {
-public:
   Drul_array<Item*> spanned_drul_;
-  void set_bounds (Direction d, Item*);
 
+public:
+  Link_array<Spanner> broken_into_l_arr_;
+  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 Spanner* find_broken_piece (Line_of_score*) const;
+  virtual Score_element* find_broken_piece (Line_of_score*) const;
 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 ();
-
-  Array<Breaking_information> broken_info_;
-  friend Axis_group_spanner; // UGH
+  Real get_broken_left_end_align () const;
 
   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